kernel-fxtec-pro1x/arch/xtensa
Jiri Kosina 617677295b Merge branch 'master' into for-next
Conflicts:
	drivers/devfreq/exynos4_bus.c

Sync with Linus' tree to be able to apply patches that are
against newer code (mvneta).
2013-01-29 10:48:30 +01:00
..
boot xtensa: don't try to build DTB when OF is disabled 2012-12-18 21:10:26 -08:00
configs xtensa: drop CONFIG_EMBEDDED_RAMDISK 2012-10-03 15:13:09 -07:00
include These are a few cleanups for asm-generic: 2012-12-21 16:39:08 -08:00
kernel xtensa: clean up files to make them code-style compliant 2012-12-18 21:10:25 -08:00
lib xtensa: clean up files to make them code-style compliant 2012-12-18 21:10:25 -08:00
mm xtensa: clean up files to make them code-style compliant 2012-12-18 21:10:25 -08:00
platforms xtensa: set the correct ethernet address for xtfpga 2012-12-18 21:10:26 -08:00
variants xtensa: unbalanced parentheses 2012-12-18 21:10:20 -08:00
Kconfig Merge branch 'master' into for-next 2013-01-29 10:48:30 +01:00
Kconfig.debug xtensa: add s32c1i sanity check 2012-12-18 21:10:22 -08:00
Makefile xtensa: don't try to build DTB when OF is disabled 2012-12-18 21:10:26 -08:00