git.stricted.de - GitHub/moto-9609/android_kernel_motorola

author	Arnd Bergmann <arnd@arndb.de>
	Fri, 6 Jul 2012 19:05:43 +0000 (21:05 +0200)
committer	Arnd Bergmann <arnd@arndb.de>
	Fri, 6 Jul 2012 19:05:43 +0000 (21:05 +0200)
commit	0bbc298d14f89c16d6839a65bc5cc977c426492d
tree	5695db6546b525cbe658f7ff9a41115eb6847aac	tree \| snapshot (tar.gz zip)
parent	4e1361100e79a65c36783929bf9df2be1be95b03	commit \| diff
parent	1463602ce7d07c22f18459e68c7d5c9a8b8ba7de	commit \| diff

Merge branch 'mxs/defconfig-for-3.6' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/defconfig

From Shawn Guo <shawn.guo@linaro.org>:

* 'mxs/defconfig-for-3.6' of git://git.linaro.org/people/shawnguo/linux-2.6:
  ARM: mxs: defconfig: Enable CONFIG_COMMON_CLK_DEBUG
  ARM: mxs_defconfig: Enable RTC driver
  ARM: mxs_defconfig: Let AUART driver be built by default
  ARM: mxs: Enable MACH_APX4DEVKIT
  ARM: mxs: Let GPMI driver be built by default

Signed-off-by: Arnd Bergmann <arnd@arndb.de>