]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge branch 'next/cleanup' into for-next
authorOlof Johansson <olof@lixom.net>
Thu, 26 Sep 2013 05:00:37 +0000 (22:00 -0700)
committerOlof Johansson <olof@lixom.net>
Thu, 26 Sep 2013 05:00:37 +0000 (22:00 -0700)
commita9b62f5f342783ff83036f8ca782d4137204cb9e
tree09b0681eb498a28da1e0609fc5beb1bddceb7d81
parent4140e2eea6879a8d61c9741e8587b92ecf7b8789
parentec01791d0ff7593fbca21a93167138a49bb94768
Merge branch 'next/cleanup' into for-next

* next/cleanup:
  video: drop code for ARCH_SHARK in cyber2000fb
  input: i8042: drop dependency on ARCH_SHARK
  ide: drop dependency on ARCH_SHARK
  block: drop dependency on ARCH_SHARK
  ARM: nomadik: delete FSMC platform data
  ARM: nomadik: delete MMCI platform data
  ARM: nomadik: register VMMC regulator
  MAINTAINERS: delete Shark machine entry
  ARM: delete mach-shark