2
0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-23 20:53:53 +08:00
linux-next/drivers/net/chelsio
Linus Torvalds 23d69b09b7 Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq
* 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq: (33 commits)
  usb: don't use flush_scheduled_work()
  speedtch: don't abuse struct delayed_work
  media/video: don't use flush_scheduled_work()
  media/video: explicitly flush request_module work
  ioc4: use static work_struct for ioc4_load_modules()
  init: don't call flush_scheduled_work() from do_initcalls()
  s390: don't use flush_scheduled_work()
  rtc: don't use flush_scheduled_work()
  mmc: update workqueue usages
  mfd: update workqueue usages
  dvb: don't use flush_scheduled_work()
  leds-wm8350: don't use flush_scheduled_work()
  mISDN: don't use flush_scheduled_work()
  macintosh/ams: don't use flush_scheduled_work()
  vmwgfx: don't use flush_scheduled_work()
  tpm: don't use flush_scheduled_work()
  sonypi: don't use flush_scheduled_work()
  hvsi: don't use flush_scheduled_work()
  xen: don't use flush_scheduled_work()
  gdrom: don't use flush_scheduled_work()
  ...

Fixed up trivial conflict in drivers/media/video/bt8xx/bttv-input.c
as per Tejun.
2011-01-07 16:58:04 -08:00
..
common.h chelsio: Remove remnants of CONFIG_CHELSIO_T1_COUGAR 2010-06-03 03:18:20 -07:00
cphy.h cxgb: set phy's mdio dev before the phy init sequence 2009-05-20 20:51:59 -07:00
cpl5_cmd.h
cxgb2.c drivers/net/chelsio: Use pr_<level>, netif_msg_<type> 2010-02-26 01:38:34 -08:00
elmer0.h
espi.c drivers/net/chelsio: Use pr_<level>, netif_msg_<type> 2010-02-26 01:38:34 -08:00
espi.h
fpga_defs.h
gmac.h
Makefile
mv88e1xxx.c cxgb: set phy's mdio dev before the phy init sequence 2009-05-20 20:51:59 -07:00
mv88e1xxx.h
mv88x201x.c cxgb: set phy's mdio dev before the phy init sequence 2009-05-20 20:51:59 -07:00
my3126.c workqueue: convert cancel_rearming_delayed_work[queue]() users to cancel_delayed_work_sync() 2010-12-15 10:56:11 +01:00
pm3393.c Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 2010-04-11 14:53:53 -07:00
regs.h
sge.c drivers/net/*/: Use static const 2010-12-21 02:16:10 -08:00
sge.h netdev: convert bulk of drivers to netdev_tx_t 2009-09-01 01:14:07 -07:00
subr.c drivers/net: Removing undead ifdef CHELSIO_T1_1G 2010-09-06 18:48:41 -07:00
suni1x10gexp_regs.h
tp.c
tp.h
vsc7326_reg.h
vsc7326.c drivers/net: return operator cleanup 2010-09-26 18:34:29 -07:00