Jeff Kirsher 2e7d21c54a e1000e: Fix merge conflict (net->net-next) ... During merge of net to net-next the changes in patch: e1000e: Fix default interrupt throttle rate not set in NIC HW got munged in param.c of the e1000e driver. This rectifies the merge issues. Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>		2012-05-09 12:06:39 -04:00
..
accessibility
acpi	Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2012-04-25 21:29:26 -07:00
amba	ARM: 7366/3: amba: Remove AMBA level regulator support	2012-04-13 14:04:08 +01:00
ata	Change summary:	2012-05-03 17:16:52 -07:00
atm	skb: Add inline helper for getting the skb end offset from head	2012-05-06 13:13:19 -04:00
auxdisplay
base	drivers/base: fix compiler warning in SoC export driver - idr should be ida	2012-04-09 14:54:22 -07:00
bcma	bcma: use fallback sprom if no on chip sprom is available	2012-04-16 13:32:01 -04:00
block	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-04-23 23:15:17 -04:00
bluetooth	Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth	2012-04-27 15:16:43 -04:00
cdrom
char	tty and serial fixes for 3.4-rc2	2012-04-12 15:36:33 -07:00
clk
clocksource	Revert "clocksource: Load the ACPI PM clocksource asynchronously"	2012-04-12 00:05:05 +02:00
connector
cpufreq	cpufreq: OMAP: fix build errors: depends on ARCH_OMAP2PLUS	2012-04-13 17:57:40 -07:00
cpuidle	Merge branches 'idle-fix' and 'misc' into release	2012-04-06 21:48:59 -04:00
crypto	crypto: talitos - properly lock access to global talitos registers	2012-04-09 15:13:40 +08:00
dca
devfreq
dio
dma	Merge branch 'fixes' of git://git.infradead.org/users/vkoul/slave-dma	2012-04-26 15:33:36 -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
firmware	efivars: Improve variable validation	2012-05-03 17:19:19 -07:00
gpio	ARM: pxa: fix gpio wakeup setting	2012-04-27 10:46:45 +08:00
gpu	nouveau: initialise has_optimus variable.	2012-05-03 09:30:58 +01:00
hid	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid	2012-04-20 10:39:33 -07:00
hsi	HSI: hsi_char: Remove max_data_size from sysfs	2012-04-23 14:23:32 +03:00
hv
hwmon	hwmon: (coretemp) Increase CPU core limit	2012-05-01 09:16:14 -07:00
hwspinlock
i2c	i2c: mxs: disable QUEUE when sending is done	2012-04-27 16:13:29 +02:00
ide
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-05-07 23:35:40 -04:00
input	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input	2012-04-30 10:13:48 -07:00
iommu	Merge branch 'akpm' (Andrew's patch-bomb)	2012-04-05 15:30:34 -07:00
isdn	isdn/capi: elliminate capincci_find() in non-middleware case	2012-05-07 22:37:57 -04:00
leds	leds-atmel-pwm.c: Make pwmled_probe() __devinit	2012-04-17 16:29:31 +02:00
lguest
macintosh
mca
md	md: fix possible corruption of array metadata on shutdown.	2012-04-24 10:23:16 +10:00
media	Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media	2012-04-21 12:43:23 -07:00
memstick
message
mfd	mfd: Fix build breakage in omap-usb-host.c	2012-05-01 11:55:04 +02:00
misc	Merge branch 'akpm' (Andrew's patch-bomb)	2012-04-05 15:30:34 -07:00
mmc	Merge branch 'fixes' of git://git.infradead.org/users/vkoul/slave-dma	2012-04-26 15:33:36 -07:00
mtd	Merge branch 'fixes' of git://git.infradead.org/users/vkoul/slave-dma	2012-04-26 15:33:36 -07:00
net	e1000e: Fix merge conflict (net->net-next)	2012-05-09 12:06:39 -04:00
nfc	NFC: pn533 Rx chaining support	2012-04-12 15:10:44 -04:00
nubus
of	netdev/of/phy: New function: of_mdio_find_bus().	2012-05-07 22:58:09 -04:00
oprofile	simple_open: automatically convert to simple_open()	2012-04-05 15:25:50 -07:00
parisc
parport
pci	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-05-07 23:35:40 -04:00
pcmcia
pinctrl	pinctrl: implement pinctrl_check_ops	2012-04-11 09:31:02 +02:00
platform	Merge branch 'akpm' (Andrew's patch-bomb)	2012-04-26 15:24:45 -07:00
pnp
power
pps
ps3
ptp	pch_gbe: correct receive time stamp filtering	2012-04-21 15:27:45 -04:00
rapidio
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
rtc	drivers/rtc/rtc-ds1307.c: fix BUG shown with lock debugging enabled	2012-04-25 21:26:34 -07:00
s390	qeth: Use blkt defaults for OSA Express 4	2012-04-24 00:33:17 -04:00
sbus
scsi	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-05-07 23:35:40 -04:00
sfi
sh
sn
spi	spi/spi-bfin5xx: Fix flush of last bit after each spi transfer	2012-04-27 12:20:39 -06:00
ssb
staging	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-05-07 23:35:40 -04:00
target	tcm_fc: Do not free tpg structure during wq allocation failure	2012-04-06 18:57:05 -07:00
tc
thermal
tty	TTY fix for 3.4-rc5	2012-05-02 13:47:49 -07:00
uio
usb	USB: ehci-tegra: remove redundant gpio_set_value	2012-05-01 14:11:51 -04:00
uwb	uwb: fix error handling	2012-04-18 13:15:51 -07:00
vhost	vhost: zerocopy: poll vq in zerocopy callback	2012-05-02 18:22:25 +03:00
video	blackfin: fix compile error in bfin-lq035q1-fb.c	2012-04-26 14:46:51 -04:00
virt
virtio	virtio_balloon: fix handling of PAGE_SIZE != 4k	2012-04-15 11:51:06 +03:00
vlynq
w1
watchdog	hpwdt: Only BYTE reads/writes to WD Timer port 0x72	2012-04-26 14:38:07 +02:00
xen	xen/acpi: Workaround broken BIOSes exporting non-existing C-states.	2012-04-26 22:07:28 -04:00
zorro
Kconfig
Makefile