linux/drivers/net/ibm_newemac
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
..
core.c Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq 2011-01-07 16:58:04 -08:00
core.h drivers/net: return operator cleanup 2010-09-26 18:34:29 -07:00
debug.c Input: sysrq - drop tty argument from sysrq ops handlers 2010-08-19 22:07:06 -07:00
debug.h of: Always use 'struct device.of_node' to get device node pointer. 2010-05-18 16:10:44 -06:00
emac.h ibm_newemac: Fix EMACx_TRTR[TRT] bit shifts 2009-11-18 05:11:09 -08:00
Kconfig
Makefile
mal.c of/device: Replace struct of_device with struct platform_device 2010-08-06 09:25:50 -06:00
mal.h of/device: Replace struct of_device with struct platform_device 2010-08-06 09:25:50 -06:00
phy.c
phy.h
rgmii.c of/device: Replace struct of_device with struct platform_device 2010-08-06 09:25:50 -06:00
rgmii.h of/device: Replace struct of_device with struct platform_device 2010-08-06 09:25:50 -06:00
tah.c of/device: Replace struct of_device with struct platform_device 2010-08-06 09:25:50 -06:00
tah.h of/device: Replace struct of_device with struct platform_device 2010-08-06 09:25:50 -06:00
zmii.c of/device: Replace struct of_device with struct platform_device 2010-08-06 09:25:50 -06:00
zmii.h of/device: Replace struct of_device with struct platform_device 2010-08-06 09:25:50 -06:00