diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-03 04:23:44 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-03 04:23:44 +0200 |
commit | 9b13776977d45505469edc6decc93e9e3799afe2 (patch) | |
tree | e66402e229b7cecd5841f021e825eb487d8beec6 /drivers/ide/ide-disk.c | |
parent | Merge branch 'for-linus' of git://github.com/tiwai/sound (diff) | |
parent | mfd: Fix generic irq chip ack function name for jz4740-adc (diff) | |
download | linux-9b13776977d45505469edc6decc93e9e3799afe2.tar.xz linux-9b13776977d45505469edc6decc93e9e3799afe2.zip |
Merge branch 'for-linus' of git://git.infradead.org/users/sameo/mfd-2.6
* 'for-linus' of git://git.infradead.org/users/sameo/mfd-2.6:
mfd: Fix generic irq chip ack function name for jz4740-adc
Diffstat (limited to 'drivers/ide/ide-disk.c')
0 files changed, 0 insertions, 0 deletions