Merge branch 'bkl-removal' of git://git.lwn.net/linux-2.6

* '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

diff --cc drivers/hid/usbhid/hiddev.c
Simple merge

diff --cc drivers/net/wan/cosa.c
Simple merge

diff --cc drivers/usb/gadget/file_storage.c
Simple merge

diff --cc fs/file_table.c
Simple merge

diff --cc include/linux/fs.h
Simple merge

diff --cc net/socket.c
Simple merge

diff --cc sound/core/oss/pcm_oss.c
Simple merge

diff --cc sound/core/pcm_native.c
Simple merge