Merge branch 's5p-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
commitc41d40b53306434628b577715487810816fca885
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 12 Feb 2011 00:15:15 +0000 (11 16:15 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 12 Feb 2011 00:15:15 +0000 (11 16:15 -0800)
tree83d0caf3cd2667f61d87aba6bf6e92857795e05d
parenta288465fa86731108c0ee590da505abe65480473
parenta09e2b21cab92e98728c16f0e6f456f723dadf8b
Merge branch 's5p-fixes-for-linus' of git://git./linux/kernel/git/kgene/linux-samsung

* 's5p-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
  ARM: SAMSUNG: Ensure struct sys_device is declared in plat/pm.h
  ARM: S5PV310: Cleanup System MMU
  ARM: S5PV310: Add support System MMU on SMDKV310