diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-11-26 17:17:16 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-11-26 17:17:16 -0500 |
| commit | d4d2ad948e9a9c316e72fdc09d7490dfda4773da (patch) | |
| tree | 38c50fa58d76fa90004a3bab593a6fa353dc1a33 /drivers/block/ataflop.c | |
| parent | 5c3b9bac28c62151f133a944fe14df5e153ae493 (diff) | |
| parent | 540565257101f7c52b6fc5a57651f7505f8d20fe (diff) | |
Merge branch 'rmobile-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6
* 'rmobile-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6:
ARM: mach-shmobile: clock-sh7372: remove bogus pllc2 clock toggling.
ARM: mach-shmobile: clock-sh7372: remove unnecessary fsi clocks
ARM: mach-shmobile: clock-sh7372: modify error code
ARM: mach-shmobile: ap4evb: FSI clock use proper process for ak4642
ARM: mach-shmobile: ap4evb: FSI clock use proper process for HDMI
ARM: mach-shmobile: clock-sh7372: remove fsidiv bogus disable
ARM: mach-shmobile: sh7372 USB0/IIC1 MSTP fix
Diffstat (limited to 'drivers/block/ataflop.c')
0 files changed, 0 insertions, 0 deletions