From: Linus Torvalds Date: Thu, 26 Mar 2009 23:14:02 +0000 (-0700) Subject: Merge branch 'bkl-removal' of git://git.lwn.net/linux-2.6 X-Git-Tag: v2.6.30-rc1~654 X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=8e9d2089723d08d51e66c5eea49253d76e27941e 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 --- 8e9d2089723d08d51e66c5eea49253d76e27941e