diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-13 10:40:00 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-13 10:40:00 -0800 |
| commit | d20056032e20061db6583f517a4d3ea4492a94f1 (patch) | |
| tree | 2cedbf4c8a427a987bdd6799eecfc441816bf9d0 /fs/ocfs2/cluster/heartbeat.c | |
| parent | 86f6f9b64a730844f1438cbedfacd6fb0170a7f7 (diff) | |
| parent | ceb50f33d478ca42baf72257381a923c797b418b (diff) | |
| download | blackbird-obmc-linux-d20056032e20061db6583f517a4d3ea4492a94f1.tar.gz blackbird-obmc-linux-d20056032e20061db6583f517a4d3ea4492a94f1.zip | |
Merge branch 'rmobile-latest' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6
* 'rmobile-latest' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6:
ARM: mach-shmobile: Kill off unused !gpio_is_valid() case
ARM: mach-shmobile: sh7372 Enable SDIO IRQs for Mackerel
ARM: mach-shmobile: sh7377 Enable SDIO IRQs
ARM: mach-shmobile: sh7367 Enable SDIO IRQs
ARM: mach-shmobile: sh7372 Enable SDIO IRQs
ARM: mach-shmobile: mackerel: Add touchscreen ST1232 support
ARM: mach-shmobile: ap4eb: SCIF port for earlyprintk when using zboot
ARM: mach-shmobile: mackerel: SCIF port for earlyprintk when using zboot
ARM: mach-shmobile: mackerel: Add support get_cd in CN23
Diffstat (limited to 'fs/ocfs2/cluster/heartbeat.c')
0 files changed, 0 insertions, 0 deletions
