summaryrefslogtreecommitdiffstats
path: root/drivers/ide
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-10-02 19:23:44 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-10-02 19:23:44 -0700
commit9b13776977d45505469edc6decc93e9e3799afe2 (patch)
treee66402e229b7cecd5841f021e825eb487d8beec6 /drivers/ide
parent4edf5886bba1a3fba3b780c7263f64c23536a4a5 (diff)
parent6fcb8a3a3a542ca078dc739fe0ea97191bc59e74 (diff)
downloadlinux-9b13776977d45505469edc6decc93e9e3799afe2.tar.bz2
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')
0 files changed, 0 insertions, 0 deletions