Linus Torvalds 63a93699c6 Merge branch 'remove' of master.kernel.org:/home/rmk/linux-2.6-arm ... * 'remove' of master.kernel.org:/home/rmk/linux-2.6-arm: ARM: 6629/2: aaec2000: remove support for mach-aaec2000 ARM: lh7a40x: remove unmaintained platform support Fix up trivial conflicts in - arch/arm/mach-{aaec2000,lh7a40x}/include/mach/memory.h (removed) - drivers/usb/gadget/Kconfig (USB_[GADGET_]LH7A40X removed, others added)		2011-03-16 19:05:40 -07:00
..
boot	Merge branch 'v6v7' into devel	2011-03-16 23:35:26 +00:00
common	Merge branch 'misc' into devel	2011-03-16 23:35:25 +00:00
configs	Merge branch 'remove' of master.kernel.org:/home/rmk/linux-2.6-arm	2011-03-16 19:05:40 -07:00
include/asm	Merge branch 'remove' of master.kernel.org:/home/rmk/linux-2.6-arm	2011-03-16 19:05:40 -07:00
kernel	Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm	2011-03-16 19:03:06 -07:00
lib
mach-at91	Merge branch 'p2v' into devel	2011-03-16 23:35:27 +00:00
mach-bcmring
mach-clps711x	Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm	2011-03-16 19:03:06 -07:00
mach-cns3xxx
mach-davinci	Merge branch 'p2v' into devel	2011-03-16 23:35:27 +00:00
mach-dove	Merge branch 'p2v' into devel	2011-03-16 23:35:27 +00:00
mach-ebsa110
mach-ep93xx	Merge branch 'p2v' into devel	2011-03-16 23:35:27 +00:00
mach-footbridge	Merge branch 'p2v' into devel	2011-03-16 23:35:27 +00:00
mach-gemini	Merge branch 'p2v' into devel	2011-03-16 23:35:27 +00:00
mach-h720x
mach-imx
mach-integrator
mach-iop13xx
mach-iop32x
mach-iop33x
mach-ixp4xx	Merge branch 'p2v' into devel	2011-03-16 23:35:27 +00:00
mach-ixp23xx
mach-ixp2000
mach-kirkwood
mach-ks8695
mach-l7200/include/mach
mach-loki
mach-lpc32xx
mach-mmp
mach-msm
mach-mv78xx0
mach-mx3
mach-mx5
mach-mxc91231
mach-mxs
mach-netx
mach-nomadik
mach-ns9xxx
mach-nuc93x
mach-omap1	Merge branch 'p2v' into devel	2011-03-16 23:35:27 +00:00
mach-omap2	Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm	2011-03-16 19:03:06 -07:00
mach-orion5x
mach-pnx4008
mach-pxa	Merge branch 'p2v' into devel	2011-03-16 23:35:27 +00:00
mach-realview	Merge branch 'p2v' into devel	2011-03-16 23:35:27 +00:00
mach-rpc
mach-s3c24a0/include/mach
mach-s3c64xx	Merge branch 'p2v' into devel	2011-03-16 23:35:27 +00:00
mach-s3c2400
mach-s3c2410	Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm	2011-03-16 19:03:06 -07:00
mach-s3c2412	ARM: s3c24xx: Switch to common GPIO controlled UDC pullup implementation	2011-03-07 12:23:22 -08:00
mach-s3c2416
mach-s3c2440	Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6	2011-03-16 15:04:26 -07:00
mach-s3c2443
mach-s5p64x0	Merge branch 'p2v' into devel	2011-03-16 23:35:27 +00:00
mach-s5p6442	Merge branch 'p2v' into devel	2011-03-16 23:35:27 +00:00
mach-s5pc100	Merge branch 'p2v' into devel	2011-03-16 23:35:27 +00:00
mach-s5pv210	Merge branch 'p2v' into devel	2011-03-16 23:35:27 +00:00
mach-s5pv310	Merge branch 'p2v' into devel	2011-03-16 23:35:27 +00:00
mach-sa1100	Merge branch 'p2v' into devel	2011-03-16 23:35:27 +00:00
mach-shark
mach-shmobile	Merge branch 'p2v' into devel	2011-03-16 23:35:27 +00:00
mach-spear3xx	ARM: 6794/1: SPEAr: Append UL to device address macros.	2011-03-09 09:50:04 +00:00
mach-spear6xx	ARM: 6794/1: SPEAr: Append UL to device address macros.	2011-03-09 09:50:04 +00:00
mach-stmp37xx
mach-stmp378x
mach-tcc8k
mach-tegra	Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm	2011-03-16 19:03:06 -07:00
mach-u300
mach-ux500	Merge branch 'p2v' into devel	2011-03-16 23:35:27 +00:00
mach-versatile
mach-vexpress
mach-vt8500
mach-w90x900
mm	Merge branch 'v6v7' into devel	2011-03-16 23:35:26 +00:00
nwfpe
oprofile
plat-iop
plat-mxc	Merge branch 'p2v' into devel	2011-03-16 23:35:27 +00:00
plat-nomadik
plat-omap	Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm	2011-03-16 19:03:06 -07:00
plat-orion
plat-pxa
plat-s3c24xx	Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm	2011-03-16 19:03:06 -07:00
plat-s5p
plat-samsung	Merge branches 'at91', 'ep93xx', 'errata', 'footbridge', 'fncpy', 'gemini', 'irqdata', 'pm', 'sh', 'smp', 'spear', 'ux500' and 'via' into devel	2011-03-16 23:35:17 +00:00
plat-spear	Merge branch 'p2v' into devel	2011-03-16 23:35:27 +00:00
plat-stmp3xxx
plat-tcc
plat-versatile
tools
vfp
Kconfig	Merge branch 'remove' of master.kernel.org:/home/rmk/linux-2.6-arm	2011-03-16 19:05:40 -07:00
Kconfig-nommu
Kconfig.debug
Makefile	Merge branch 'remove' of master.kernel.org:/home/rmk/linux-2.6-arm	2011-03-16 19:05:40 -07:00