Anton Vorontsov 76d8a23b12 Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux ... The merge is merely to fix conflicts before sending a pull request. Conflicts: drivers/power/ab8500_btemp.c drivers/power/ab8500_charger.c drivers/power/ab8500_fg.c drivers/power/abx500_chargalg.c drivers/power/max8925_power.c Signed-off-by: Anton Vorontsov <anton.vorontsov@linaro.org>		2012-12-11 22:15:57 -08:00
..
bootp	ARM: 6499/1: Thumb-2: Correct data alignment for CONFIG_THUMB2_KERNEL in bootp/init.S	2010-11-30 13:44:24 +00:00
compressed	ARM: 7583/1: decompressor: Enable unaligned memory access for v6 and above	2012-11-23 13:02:03 +00:00
dts	Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux	2012-12-11 22:15:57 -08:00
.gitignore	ARM: devicetree: Add .dtb files to arch/arm/boot/.gitignore	2012-01-30 11:47:37 -07:00
install.sh	kbuild: use INSTALLKERNEL to select customized installkernel script	2009-09-20 12:18:14 +02:00
Makefile	Device tree changes for v3.8	2012-12-11 11:30:41 -08:00