Merge commit 'linus/master' into bkl/core

Merge reason: The staging tree has introduced the easycap
driver lately. We need the latest updates to pushdown the
bkl in its ioctl helper.
This commit is contained in:
Frederic Weisbecker 2010-08-09 01:49:58 +02:00
commit d9a145fb6e
6718 changed files with 432430 additions and 401184 deletions

View file

@ -728,8 +728,8 @@ out_fput:
out_bdi:
/* 23/12/1998 Marcin Dalecki <[email protected]>:
*
* The previously used put_filp(ncp_filp); was bogous, since
* it doesn't proper unlocking.
* The previously used put_filp(ncp_filp); was bogus, since
* it doesn't perform proper unlocking.
*/
fput(ncp_filp);
out: