diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-02 19:23:44 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-02 19:23:44 -0700 |
| commit | 9b13776977d45505469edc6decc93e9e3799afe2 (patch) | |
| tree | e66402e229b7cecd5841f021e825eb487d8beec6 /drivers/ide/ide-disk.c | |
| parent | 4edf5886bba1a3fba3b780c7263f64c23536a4a5 (diff) | |
| parent | 6fcb8a3a3a542ca078dc739fe0ea97191bc59e74 (diff) | |
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