diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-07 21:16:27 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-07 21:16:27 +0100 |
| commit | 2d51daaa615e4724f24e43fa01e705c40551080a (patch) | |
| tree | 3596123890aae2645a189a75bdf45789e89ae2d9 /fs/notify/fanotify/fanotify_user.c | |
| parent | Merge tag 'gpio-for-linus' of git://git.secretlab.ca/git/linux-2.6 (diff) | |
| parent | Merge branch 'spi/next' (early part) into spi/merge (diff) | |
| download | linux-2d51daaa615e4724f24e43fa01e705c40551080a.tar.xz linux-2d51daaa615e4724f24e43fa01e705c40551080a.zip | |
Merge tag 'spi-for-linus' of git://git.secretlab.ca/git/linux-2.6
spi changes queued up for v3.3 merge window
* tag 'spi-for-linus-20120104' of git://git.secretlab.ca/git/linux-2.6:
spi: Fix device unregistration when unregistering the bus master
spi-topcliff-pch: Change company name OKI SEMICONDUCTOR to LAPIS Semiconductor
spi-topcliff-pch: Support new device LAPIS Semiconductor ML7831 IOH
spi/omap: Correct the error path
spi/omap: call pm_runtime_disable in error path and remove
spi/omap: Use a workqueue per omap2_mcspi controller
Diffstat (limited to 'fs/notify/fanotify/fanotify_user.c')
0 files changed, 0 insertions, 0 deletions