diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-08 18:34:16 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-08 18:34:16 -0800 |
| commit | 19e0bafc36abd84a5b4d7c7745b78a6f4626e944 (patch) | |
| tree | 03de585a0d840db316bcd93eca8882a920ae6c70 /drivers/ata/pata_cmd640.c | |
| parent | ed72a3d1b4acb8ace77a1049fbbcbc7edb035267 (diff) | |
| parent | 6aec187a90aeb883533c9180e2acac1e54c87f7d (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux:
drivers/media: video/a5k6aa is a module and so needs module.h
mfd: fix build failures in recently added ab5500 code
hwspinlock/u8500: include linux/module.h
MTD: MAPS: bcm963xx-flash.c: explicitly include module.h
Diffstat (limited to 'drivers/ata/pata_cmd640.c')
0 files changed, 0 insertions, 0 deletions