p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
linux_old1/net/atm
History
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
..
Kconfig [ATM]: atm is no longer experimental 2008-01-28 15:00:11 -08:00
Makefile [ATM]: Kill ipcommon.[ch] 2006-12-02 21:32:08 -08:00
addr.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
addr.h atm: use const where reasonable 2008-06-17 16:20:06 -07:00
atm_misc.c net/atm/atm_misc.c: checkpatch cleanups 2010-01-26 21:15:57 -08:00
atm_sysfs.c atm: correct sysfs 'device' link creation and parent relationships 2010-12-10 15:45:05 -08:00
br2684.c net/atm: Remove unnecessary casts of netdev_priv 2010-11-17 10:37:52 -08:00
clip.c net: use the macros defined for the members of flowi 2010-11-17 12:27:45 -08:00
common.c net/atm: Adjust confusing if indentation 2010-08-16 21:06:26 -07:00
common.h net: Make setsockopt() optlen be unsigned. 2009-09-30 16:12:20 -07:00
ioctl.c net/atm/ioctl.c: checkpatch cleanups 2010-01-26 21:15:59 -08:00
lec.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
lec.h lec: convert to internal network_device_stats 2009-01-21 14:02:00 -08:00
lec_arpc.h [ATM]: [lec] add reference counting to lec_arp entries 2006-09-29 17:16:48 -07:00
mpc.c net: kill unused macros 2010-12-19 21:59:35 -08:00
mpc.h atm: convert mpc device to using netdev_ops 2009-03-21 19:19:12 -07:00
mpoa_caches.c net: Remove unnecessary returns from void function()s 2010-05-17 23:23:14 -07:00
mpoa_caches.h [NET] ATM: Fix whitespace errors. 2007-02-10 23:19:16 -08:00
mpoa_proc.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
pppoatm.c ppp: make channel_ops const 2010-08-04 21:53:17 -07:00
proc.c llseek: automatically add .llseek fop 2010-10-15 15:53:27 +02:00
protocols.h
…
pvc.c net/atm/pvc.c: checkpatch cleanups 2010-01-26 21:16:02 -08:00
raw.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
resources.c atm: correct sysfs 'device' link creation and parent relationships 2010-12-10 15:45:05 -08:00
resources.h atm: correct sysfs 'device' link creation and parent relationships 2010-12-10 15:45:05 -08:00
signaling.c net: sk_sleep() helper 2010-04-20 16:37:13 -07:00
signaling.h [NET] ATM: Fix whitespace errors. 2007-02-10 23:19:16 -08:00
svc.c net: sk_sleep() helper 2010-04-20 16:37:13 -07:00