iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
linux/drivers
History
David S. Miller 56845d78ce Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	drivers/net/ethernet/atheros/atlx/atl1.c
	drivers/net/ethernet/atheros/atlx/atl1.h

Resolved a conflict between a DMA error bug fix and NAPI
support changes in the atl1 driver.

Signed-off-by: David S. Miller <davem@davemloft.net>
2012-04-15 13:19:04 -04:00
..
accessibility
vt:tackle kbd_table
2012-03-08 10:50:35 -08:00
acpi
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux
2012-04-06 19:56:04 -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
regmap: A couple of small fixes for 3.4
2012-04-07 09:56:00 -07:00
bcma
bcma: fix build error on MIPS; implicit pcibios_enable_device
2012-04-10 14:13:30 -04:00
block
Two fixes for regressions:
2012-04-06 17:54:53 -07: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
drivers/char/random.c: fix boot id uniqueness race
2012-04-12 13:12:12 -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 branches 'idle-fix' and 'misc' into release
2012-04-06 21:48:59 -04: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
dmaengine-fixes for 3.4-rc3
2012-04-10 15:30:16 -07:00
edac
Merge branch 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile
2012-04-06 17:56:20 -07: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 'exynos-drm-fixes' of git://git.infradead.org/users/kmpark/linux-samsung into drm-intel-fixes
2012-04-12 17:42:01 +01: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
i2c: prevent spurious interrupt on Designware controllers
2012-04-10 08:09:03 -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-12 19:41:23 -04:00
input
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
2012-04-12 12:49:07 -07:00
iommu
Merge branch 'akpm' (Andrew's patch-bomb)
2012-04-05 15:30:34 -07:00
isdn
isdn/hysdn: Convert to kstrtoul_from_user
2012-04-15 03:23:31 -04: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/bitmap: prevent bitmap_daemon_work running while initialising bitmap
2012-04-12 16:05:06 +10:00
media
Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
2012-04-11 11:05:34 -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
mmc: use really long write timeout to deal with crappy cards
2012-04-05 20:32:34 -04:00
mtd
fix breakage in mtdchar_open(), sanitize failure exits
2012-04-09 01:38:55 -04:00
net
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2012-04-15 13:19:04 -04:00
nfc
NFC: Remove the rf mode parameter from the DEP link up routine
2012-03-06 15:16:23 -05:00
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
Two fixes for regressions:
2012-04-06 17:54:53 -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
pps: class_create() returns an ERR_PTR, not NULL
2012-03-05 15:49:43 -08:00
ps3
…
ptp
ixp4xx_eth: Fix up the get_ts_info ethtool method.
2012-04-12 16:01:09 -04:00
rapidio
rapidio/tsi721: fix bug in register offset definitions
2012-03-15 17:03:03 -07:00
regulator
regulator: Fix a build warning in the anatop driver for 3.4
2012-04-10 10:26:41 -07:00
remoteproc
simple_open: automatically convert to simple_open()
2012-04-05 15:25:50 -07:00
rpmsg
rpmsg: fix build warning when dma_addr_t is 64-bit
2012-03-04 13:43:41 +02:00
rtc
drivers/rtc/rtc-pl031.c: enable clock on all ST variants
2012-04-12 13:12:12 -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
android, lowmemorykiller: remove task handoff notifier
2012-04-09 20:48:44 -07:00
target
tcm_fc: Do not free tpg structure during wq allocation failure
2012-04-06 18:57:05 -07:00
tc
…
thermal
thermal: Fix for setting the thermal zone mode to enable/disable
2012-03-22 01:10:18 -04:00
tty
SuperH updates for 3.4-rc1
2012-04-07 09:52:46 -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
skbuff: struct ubuf_info callback type safety
2012-04-13 13:09:19 -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
DS2781 Maxim Stand-Alone Fuel Gauge battery and w1 slave drivers
2012-03-08 11:15:33 -08:00
watchdog
ARM: cleanups of io includes
2012-03-29 18:02:10 -07:00
xen
Two fixes for regressions:
2012-04-06 17:54:53 -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