diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-11-15 08:41:30 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-11-15 08:41:30 -0800 |
| commit | 58e89c274f202d7fd59694b7b74fa676018435a2 (patch) | |
| tree | aa5d71bd6f9d797d2f9fc1b5cf7c3f679796748f /COPYING | |
| parent | 2744b8889cd6d4a730634400d337bee07d1702bc (diff) | |
| parent | 6318af900ca7cb2c94b27d3c358762e6ac187e25 (diff) | |
| parent | c8f367802c5fdae87b36b2f846b46f38486b239b (diff) | |
Merge branches 'sh-fixes-for-linus' and 'rmobile-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6
* 'sh-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6:
sh: intc: Fix up build failure introduced by radix tree changes.
MAINTAINERS: update the sh git tree entry.
sh: clkfwk: fix up compiler warnings.
sh: intc: Fix up initializers for gcc 4.5.
rtc: rtc-sh - fix a memory leak
* 'rmobile-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6:
ARM: mach-shmobile: ap4evb: add fsib 44100Hz rate
MAINTAINERS: update the ARM SH-Mobile git tree entry.
ARM: mach-shmobile: ap4evb: Mark NOR boot loader partitions read-only.
ARM: mach-shmobile: intc-sh7372: fix interrupt number