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
..
accessibility
acpi	Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6	2011-03-16 19:01:29 -07:00
amba
ata	Merge branch 'devicetree/next' of git://git.secretlab.ca/git/linux-2.6	2011-03-16 17:28:10 -07:00
atm
auxdisplay
base	Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6	2011-03-16 15:05:40 -07:00
block	Merge branch 'devicetree/next' of git://git.secretlab.ca/git/linux-2.6	2011-03-16 17:28:10 -07:00
bluetooth	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2011-03-16 16:29:25 -07:00
cdrom
char	Merge branch 'devicetree/next' of git://git.secretlab.ca/git/linux-2.6	2011-03-16 17:28:10 -07:00
clk
clocksource
connector
cpufreq	Merge branch 'for-2.6.39' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq	2011-03-16 08:20:19 -07:00
cpuidle
crypto	Merge branch 'devicetree/next' of git://git.secretlab.ca/git/linux-2.6	2011-03-16 17:28:10 -07:00
dca
dio
dma
edac
eisa
firewire
firmware	Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6	2011-03-16 15:05:40 -07:00
gpio
gpu	drm/radeon: fix problem with changing active VRAM size. (v2)	2011-03-14 12:51:04 +10:00
hid
hwmon	Merge branch 'devicetree/next' of git://git.secretlab.ca/git/linux-2.6	2011-03-16 17:28:10 -07:00
i2c	Merge branch 'devicetree/next' of git://git.secretlab.ca/git/linux-2.6	2011-03-16 17:28:10 -07:00
ide
idle
ieee802154
infiniband	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2011-03-16 16:29:25 -07:00
input	Merge branch 'devicetree/next' of git://git.secretlab.ca/git/linux-2.6	2011-03-16 17:28:10 -07:00
isdn	Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6	2011-03-16 15:11:04 -07:00
leds
lguest
macintosh
mca
md	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2011-03-16 16:29:25 -07:00
media	Merge branch 'devicetree/next' of git://git.secretlab.ca/git/linux-2.6	2011-03-16 17:28:10 -07:00
memstick
message
mfd	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
misc	Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6	2011-03-16 15:11:04 -07:00
mmc	Merge branch 'devicetree/next' of git://git.secretlab.ca/git/linux-2.6	2011-03-16 17:28:10 -07:00
mtd	Merge branch 'devicetree/next' of git://git.secretlab.ca/git/linux-2.6	2011-03-16 17:28:10 -07:00
net	Merge branch 'remove' of master.kernel.org:/home/rmk/linux-2.6-arm	2011-03-16 19:05:40 -07:00
nfc
nubus
of	Merge branch 'devicetree/next' of git://git.secretlab.ca/git/linux-2.6	2011-03-16 17:28:10 -07:00
oprofile
parisc
parport
pci	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6	2011-03-16 09:24:44 -07:00
pcmcia	Merge branch 'devicetree/next' of git://git.secretlab.ca/git/linux-2.6	2011-03-16 17:28:10 -07:00
platform
pnp
power
pps
ps3
rapidio
regulator
rtc	Merge branch 'devicetree/next' of git://git.secretlab.ca/git/linux-2.6	2011-03-16 17:28:10 -07:00
s390	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2011-03-16 16:29:25 -07:00
sbus
scsi	Merge branch 'devicetree/next' of git://git.secretlab.ca/git/linux-2.6	2011-03-16 17:28:10 -07:00
sfi
sh
sn
spi
ssb
staging	Merge branch 'config' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl	2011-03-16 17:21:00 -07:00
target	Merge branch 'config' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl	2011-03-16 17:21:00 -07:00
tc
telephony
thermal
tty	Merge branch 'remove' of master.kernel.org:/home/rmk/linux-2.6-arm	2011-03-16 19:05:40 -07:00
uio
usb	Merge branch 'remove' of master.kernel.org:/home/rmk/linux-2.6-arm	2011-03-16 19:05:40 -07:00
uwb
vhost
video	Merge branch 'remove' of master.kernel.org:/home/rmk/linux-2.6-arm	2011-03-16 19:05:40 -07:00
virtio
vlynq
w1
watchdog	Merge branch 'devicetree/next' of git://git.secretlab.ca/git/linux-2.6	2011-03-16 17:28:10 -07:00
xen	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2011-03-16 16:29:25 -07:00
zorro
Kconfig
Makefile