Merge branch 'bkl-removal' of git://git.lwn.net/linux-2.6
Linus Torvalds [Thu, 26 Mar 2009 23:14:02 +0000 (16:14 -0700)]
* 'bkl-removal' of git://git.lwn.net/linux-2.6:
  Rationalize fasync return values
  Move FASYNC bit handling to f_op->fasync()
  Use f_lock to protect f_flags
  Rename struct file->f_ep_lock

1  2 
drivers/hid/usbhid/hiddev.c
drivers/net/wan/cosa.c
drivers/usb/gadget/file_storage.c
fs/file_table.c
include/linux/fs.h
net/socket.c
sound/core/oss/pcm_oss.c
sound/core/pcm_native.c

Simple merge
Simple merge
Simple merge
diff --cc fs/file_table.c
Simple merge
Simple merge
diff --cc net/socket.c
Simple merge
Simple merge
Simple merge