1
0
Fork 0
alistair23-linux/drivers/staging/lirc
Linus Torvalds 72eb6a7914 Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu
* 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu: (30 commits)
  gameport: use this_cpu_read instead of lookup
  x86: udelay: Use this_cpu_read to avoid address calculation
  x86: Use this_cpu_inc_return for nmi counter
  x86: Replace uses of current_cpu_data with this_cpu ops
  x86: Use this_cpu_ops to optimize code
  vmstat: User per cpu atomics to avoid interrupt disable / enable
  irq_work: Use per cpu atomics instead of regular atomics
  cpuops: Use cmpxchg for xchg to avoid lock semantics
  x86: this_cpu_cmpxchg and this_cpu_xchg operations
  percpu: Generic this_cpu_cmpxchg() and this_cpu_xchg support
  percpu,x86: relocate this_cpu_add_return() and friends
  connector: Use this_cpu operations
  xen: Use this_cpu_inc_return
  taskstats: Use this_cpu_ops
  random: Use this_cpu_inc_return
  fs: Use this_cpu_inc_return in buffer.c
  highmem: Use this_cpu_xx_return() operations
  vmstat: Use this_cpu_inc_return for vm statistics
  x86: Support for this_cpu_add, sub, dec, inc_return
  percpu: Generic support for this_cpu_add, sub, dec, inc_return
  ...

Fixed up conflicts: in arch/x86/kernel/{apic/nmi.c, apic/x2apic_uv_x.c, process.c}
as per Tejun.
2011-01-07 17:02:58 -08:00
..
Kconfig [media] Remove staging/lirc/lirc_i2c driver 2010-12-30 12:17:12 -02:00
Makefile [media] Remove staging/lirc/lirc_i2c driver 2010-12-30 12:17:12 -02:00
TODO V4L/DVB: staging/lirc: wire up Kconfig and Makefile bits 2010-08-02 16:43:34 -03:00
TODO.lirc_zilog [media] staging/lirc: Update lirc TODO files 2010-12-30 12:17:21 -02:00
lirc_bt829.c V4L/DVB: staging/lirc: CodingStyle cleanups 2010-08-02 16:43:35 -03:00
lirc_ene0100.h V4L/DVB: staging/lirc: add lirc_ene0100 driver 2010-08-02 16:43:21 -03:00
lirc_igorplugusb.c [media] lirc_igorplugusb: add Fit PC2 device ID 2010-10-22 20:05:37 -02:00
lirc_imon.c Merge 'staging-next' to Linus's tree 2010-10-28 09:44:56 -07:00
lirc_it87.c Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6 2010-10-28 09:35:11 -07:00
lirc_it87.h V4L/DVB: staging/lirc: add lirc_it87 driver 2010-08-02 16:43:26 -03:00
lirc_ite8709.c [media] staging/lirc: ioctl portability fixups 2010-10-21 01:18:35 -02:00
lirc_parallel.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 2010-10-28 12:13:00 -07:00
lirc_parallel.h V4L/DVB: staging/lirc: add lirc_parallel driver 2010-08-02 16:43:27 -03:00
lirc_sasem.c Merge 'staging-next' to Linus's tree 2010-10-28 09:44:56 -07:00
lirc_serial.c x86: Replace uses of current_cpu_data with this_cpu ops 2010-12-30 12:22:03 +01:00
lirc_sir.c Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6 2010-10-28 09:35:11 -07:00
lirc_ttusbir.c V4L/DVB: staging/lirc: CodingStyle cleanups 2010-08-02 16:43:35 -03:00
lirc_zilog.c [media] lirc_zilog: Remove use of deprecated struct i2c_adapter.id field 2010-12-30 12:17:17 -02:00