android_kernel_samsung_msm8976/net/atm
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
..
addr.c
addr.h
atm_misc.c
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
ioctl.c
Kconfig
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_arpc.h
Makefile
mpc.c net: kill unused macros 2010-12-19 21:59:35 -08:00
mpc.h
mpoa_caches.c
mpoa_caches.h
mpoa_proc.c
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
raw.c
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
signaling.h
svc.c