Jiri Kosina 4b7bd36470 Merge branch 'master' into for-next ...

Conflicts:
	MAINTAINERS
	arch/arm/mach-omap2/pm24xx.c
	drivers/scsi/bfa/bfa_fcpim.c

Needed to update to apply fixes for which the old branch was too
outdated.

2010-12-22 18:57:02 +01:00

..

e1000_ethtool.c

e1000: use netif_<level> instead of netdev_<level>

2010-07-26 23:37:21 -07:00

e1000_hw.c

e1000: Use netdev_<level>, pr_<level> and dev_<level>

2010-04-27 17:05:03 -07:00

e1000_hw.h

tree-wide: fix comment/printk typos

2010-11-01 15:38:34 -04:00

e1000_main.c

Merge branch 'master' into for-next

2010-12-22 18:57:02 +01:00

e1000_osdep.h

e1000: Use netdev_<level>, pr_<level> and dev_<level>

2010-04-27 17:05:03 -07:00

e1000_param.c

e1000: cleanup unused parameters

2010-05-14 03:06:19 -07:00

e1000.h

e1000: use work queues

2010-09-23 14:33:37 -07:00

Makefile

…