iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
linux/drivers
History
John W. Linville 7eab0f64a9 Merge branch 'master' into for-davem 
Conflicts:
	drivers/net/wireless/iwlwifi/iwl-testmode.c
	net/wireless/nl80211.c
2012-04-12 14:41:59 -04:00
..
accessibility
…
acpi
Merge branch 'akpm' (Andrew's patch-bomb)
2012-04-05 15:30:34 -07:00
amba
…
ata
1) AHCI regression fix. A recent "make driver conform to spec" change
2012-03-22 20:22:30 -07:00
atm
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2012-04-10 14:30:45 -04:00
auxdisplay
…
base
Merge branch 'akpm' (Andrew's patch-bomb)
2012-04-05 15:30:34 -07:00
bcma
bcma: fix build error on MIPS; implicit pcibios_enable_device
2012-04-10 14:13:30 -04:00
block
x86: Remove the ancient and deprecated disable_hlt() and enable_hlt() facility
2012-03-30 08:50:27 +02:00
bluetooth
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth
2012-04-09 15:47:49 -04:00
cdrom
powerpc: Remove some of the legacy iSeries specific device drivers
2012-03-16 09:28:05 +11:00
char
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm
2012-04-05 17:34:30 -07:00
clk
clk: make CONFIG_COMMON_CLK invisible
2012-03-19 09:37:11 +00:00
clocksource
Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm
2012-03-29 16:53:48 -07:00
connector
…
cpufreq
ARM: SoC fixes for 3.4-rc2
2012-04-05 22:13:39 -07:00
cpuidle
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux
2012-03-30 16:45:39 -07:00
crypto
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
2012-03-22 18:15:32 -07:00
dca
…
devfreq
ARM: global cleanups
2012-03-27 16:03:32 -07:00
dio
…
dma
Merge branch 'akpm' (Andrew's patch-bomb)
2012-04-05 15:30:34 -07:00
edac
MCE, AMD: Drop too granulary family model checks
2012-04-04 15:50:11 +02:00
eisa
…
firewire
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
firmware
…
gpio
gpio: tegra: Iterate over the correct number of banks
2012-04-04 13:13:18 -06:00
gpu
Merge branch 'akpm' (Andrew's patch-bomb)
2012-04-05 15:30:34 -07:00
hid
simple_open: automatically convert to simple_open()
2012-04-05 15:25:50 -07:00
hsi
…
hv
net/hyperv: Add flow control based on hi/low watermark
2012-04-03 17:47:15 -04:00
hwmon
hwmon: (ad7314) Adds missing spi_dev initialization
2012-04-03 17:08:28 -07:00
hwspinlock
…
i2c
Disintegrate and delete asm/system.h
2012-03-28 15:58:21 -07:00
ide
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
idle
simple_open: automatically convert to simple_open()
2012-04-05 15:25:50 -07:00
ieee802154
…
infiniband
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2012-04-10 14:30:45 -04:00
input
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
2012-03-29 23:17:44 -07:00
iommu
Merge branch 'akpm' (Andrew's patch-bomb)
2012-04-05 15:30:34 -07:00
isdn
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2012-04-02 17:53:39 -07:00
leds
MFD changes for 3.4
2012-03-28 13:56:35 -07:00
lguest
…
macintosh
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
mca
…
md
md/raid1,raid10: don't compare excess byte during consistency check.
2012-04-03 15:39:23 +10:00
media
ARM: cleanups of io includes
2012-03-29 18:02:10 -07:00
memstick
memstick: remove the second argument of k[un]map_atomic()
2012-03-20 21:48:19 +08:00
message
Disintegrate and delete asm/system.h
2012-03-28 15:58:21 -07:00
mfd
Merge branch 'akpm' (Andrew's patch-bomb)
2012-04-05 15:30:34 -07:00
misc
Merge branch 'akpm' (Andrew's patch-bomb)
2012-04-05 15:30:34 -07:00
mmc
MTD merge for 3.4
2012-03-30 17:31:56 -07:00
mtd
Merge branch 'akpm' (Andrew's patch-bomb)
2012-04-05 15:30:34 -07:00
net
Merge branch 'master' into for-davem
2012-04-12 14:41:59 -04:00
nfc
…
nubus
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
of
GPIO changes for v3.4
2012-03-28 14:08:46 -07:00
oprofile
simple_open: automatically convert to simple_open()
2012-04-05 15:25:50 -07:00
parisc
Disintegrate and delete asm/system.h
2012-03-28 15:58:21 -07:00
parport
…
pci
ASPM: Fix pcie devices with non-pcie children
2012-03-31 12:49:56 -07:00
pcmcia
Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia
2012-03-29 16:00:48 -07:00
pinctrl
pinctrl: support pinconfig on the U300
2012-03-12 22:49:03 +01:00
platform
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux
2012-03-30 16:45:39 -07:00
pnp
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux
2012-03-30 16:45:39 -07:00
power
Various small bugfixes and enhancements, plus two new drivers:
2012-03-30 16:09:02 -07:00
pps
…
ps3
…
ptp
ixp4xx_eth: Support the get_ts_info ethtool method.
2012-04-04 05:28:46 -04:00
rapidio
rapidio/tsi721: fix bug in register offset definitions
2012-03-15 17:03:03 -07:00
regulator
regulator: Fixes for -rc1
2012-04-04 10:09:30 -07:00
remoteproc
simple_open: automatically convert to simple_open()
2012-04-05 15:25:50 -07:00
rpmsg
…
rtc
Merge branch 'akpm' (Andrew's patch-bomb)
2012-04-05 15:30:34 -07:00
s390
Disintegrate and delete asm/system.h
2012-03-28 15:58:21 -07:00
sbus
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
scsi
Merge branch 'akpm' (Andrew's patch-bomb)
2012-04-05 15:30:34 -07:00
sfi
…
sh
SuperH updates for 3.4 merge window
2012-03-30 00:09:17 -07:00
sn
…
spi
Merge branch 'akpm' (Andrew's patch-bomb)
2012-04-05 15:30:34 -07:00
ssb
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2012-03-20 21:04:47 -07:00
staging
Documentation: remove references to /etc/modprobe.conf
2012-03-30 16:03:15 -07:00
target
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending
2012-03-22 12:38:04 -07:00
tc
…
thermal
thermal: Fix for setting the thermal zone mode to enable/disable
2012-03-22 01:10:18 -04:00
tty
Merge branch 'akpm' (Andrew's patch-bomb)
2012-04-05 15:30:34 -07:00
uio
…
usb
ARM: SoC fixes for 3.4-rc2
2012-04-05 22:13:39 -07:00
uwb
simple_open: automatically convert to simple_open()
2012-04-05 15:25:50 -07:00
vhost
Merge branch 'vhost-net' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
2012-03-23 14:46:48 -04:00
video
ARM: SoC fixes for 3.4-rc2
2012-04-05 22:13:39 -07:00
virt
…
virtio
virtio-pci: switch to PM ops macro to initialise PM functions
2012-03-31 08:09:51 +05:30
vlynq
…
w1
…
watchdog
ARM: cleanups of io includes
2012-03-29 18:02:10 -07:00
xen
Merge branch 'for-linus' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping
2012-04-04 17:13:43 -07:00
zorro
…
Kconfig
Merge branch 'for-next' of git://gitorious.org/kernel-hsi/kernel-hsi
2012-04-02 09:50:40 -07:00
Makefile
Merge branch 'for-next' of git://gitorious.org/kernel-hsi/kernel-hsi
2012-04-02 09:50:40 -07:00