diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-12-14 17:36:35 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-12-14 17:36:35 -0800 |
commit | ec5d043f2809b9aaf14e6676ddb0dc8c3a6dc8de (patch) | |
tree | bfa26c277edb20b17b4d7f0975bf29ca6052f4e4 /arch/sparc/mm | |
parent | fc47e672ee2a8dfcde7673997c8b1e0cec38e2c9 (diff) | |
parent | c2015dc88a57090bcf67ab7cfcdbc34671598d36 (diff) |
Merge branch 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6
* 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6:
OMAP2: PRCM: fix some SHIFT macros that were actually bitmasks
OMAP2+: PM/serial: fix console semaphore acquire during suspend
OMAP1: SRAM: fix size for OMAP1611 SoCs
arm: omap2: io: fix clk_get() error check
arm: plat-omap: counter_32k: use IS_ERR() instead of NULL check
omap: nand: remove hardware ECC as default
omap: zoom: wl1271 slot is MMC_CAP_POWER_OFF_CARD
omap: PM debug: fix wake-on-timer debugfs dependency
Diffstat (limited to 'arch/sparc/mm')
0 files changed, 0 insertions, 0 deletions