| commit | 10041d2d14688e207d0d829095147aa82c1f211b | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Aug 13 17:52:35 2010 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri Aug 13 17:52:35 2010 -0700 |
| tree | 57ef361d05e6bbffe3ec490ca9110878a6e969e2 | |
| parent | 4914c7f881845367b9198631a014ab466329b9e5 [diff] | |
| parent | b19dd42faf413b4705d4adb38521e82d73fa4249 [diff] |
Merge branch 'bkl/ioctl' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing * 'bkl/ioctl' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing: bkl: Remove locked .ioctl file operation v4l: Remove reference to bkl ioctl in compat ioctl handling logfs: kill BKL