From: Olof Johansson <olof@lixom.net>
Date: Tue, 16 Oct 2012 18:19:43 +0000 (-0700)
Subject: Merge branch 'next/cleanup' into for-next
X-Git-Tag: next-20121017~12^2
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=0a5f9fefc2b895509d910dacf1f1303b32958bba;p=karo-tx-linux.git

Merge branch 'next/cleanup' into for-next

* next/cleanup:
  vt8500: Fix header in mach-vt8500/timer.c
  vt8500: Remove arm/boot/compressed/head-vt8500.S
  vt8500: Remove unused headers from include/mach/
---

0a5f9fefc2b895509d910dacf1f1303b32958bba
diff --cc arch/arm/arm-soc-for-next-contents.txt
index 5f322765d994,000000000000..cb4e35a5dbf3
mode 100644,000000..100644
--- a/arch/arm/arm-soc-for-next-contents.txt
+++ b/arch/arm/arm-soc-for-next-contents.txt
@@@ -1,7 -1,0 +1,7 @@@
 +arm-soc for-next contents for 3.8:
 +
 +next/fixes-non-critical:
 +
 +next/cleanup:
 +imx/multiplatform	git://git.linaro.org/people/shawnguo/linux-2.6.git imx/multi-platform
- 
++vt8500/cleanup		git://server.prisktech.co.nz/git/linuxwmt.git/ tags/cleanup-for-3.8