iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
linux/drivers
History
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
dt: Eliminate of_platform_{,un}register_driver
2011-02-28 13:22:46 -07:00
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
cdrom: support devices that have check_events but not media_changed
2011-02-09 14:22:37 +01:00
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
connector: Convert char *name to const char *name
2011-02-23 13:22:26 -08:00
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
dt/powerpc: Eliminate users of of_platform_{,un}register_driver
2011-02-28 01:36:39 -07:00
edac
dt/powerpc: Eliminate users of of_platform_{,un}register_driver
2011-02-28 01:36:39 -07:00
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
gpio: add MODULE_DEVICE_TABLE
2011-03-13 15:35:59 -07:00
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
intel_idle: disable Atom/Lincroft HW C-state auto-demotion
2011-02-17 17:08:48 -05:00
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
leds/leds-gpio: merge platform_driver with of_platform_driver
2011-02-28 01:36:39 -07:00
lguest
…
macintosh
dt/powerpc: Eliminate users of of_platform_{,un}register_driver
2011-02-28 01:36:39 -07:00
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
workqueue, freezer: unify spelling of 'freeze' + 'able' to 'freezable'
2011-02-16 17:48:59 +01:00
message
Merge branch 'master' into for-2.6.39
2011-02-21 09:43:56 +01:00
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
drivers/nfc/pn544.c: add missing regulator
2011-02-25 15:07:36 -08:00
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
dt/sparc: Eliminate users of of_platform_{,un}register_driver
2011-02-28 01:36:39 -07:00
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
dell-laptop: Toggle the unsupported hardware killswitch
2011-02-21 17:06:21 -05:00
pnp
…
power
…
pps
pps: make pps_gen_parport depend on BROKEN
2011-03-04 17:53:38 -08:00
ps3
…
rapidio
rapidio: fix sysfs config attribute to access 16MB of maint space
2011-02-25 15:07:37 -08:00
regulator
regulator, mc13xxx: Remove pointless test for unsigned less than zero
2011-02-25 08:51:07 +00:00
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
dt/sparc: Eliminate users of of_platform_{,un}register_driver
2011-02-28 01:36:39 -07:00
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
dt/spi: Eliminate users of of_platform_{,un}register_driver
2011-02-28 13:22:44 -07:00
ssb
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
2011-02-22 15:10:22 -05:00
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
ACPI: Fix build for CONFIG_NET unset
2011-02-28 18:00:31 -08:00
tty
Merge branch 'remove' of master.kernel.org:/home/rmk/linux-2.6-arm
2011-03-16 19:05:40 -07:00
uio
UIO: add PRUSS UIO driver support
2011-03-07 13:10:27 -08:00
usb
Merge branch 'remove' of master.kernel.org:/home/rmk/linux-2.6-arm
2011-03-16 19:05:40 -07:00
uwb
drivers:uwb:scan.c remove one to many l's in the word.
2011-02-25 11:52:21 -08:00
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
drivers/w1/masters/omap_hdq.c: add missing clk_put
2011-02-11 16:12:20 -08:00
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
…