Manual merge with Linus (conflict in drivers/input/misc/wistron_bnts.c)
[linux-2.6] / include / asm-m32r / atomic.h
2005-12-02  Linus TorvaldsMerge /linux/kernel/git/jejb/scsi-rc-fixes-2.6
2005-12-01  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2005-11-30  Steve FrenchMerge ... /linux/kernel/git/torvalds/linux-2.6.git
2005-11-28  Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-serial
2005-11-28  Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-mmc
2005-11-28  Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-arm
2005-11-28  Hirokazu Takata[PATCH] m32r: Introduce atomic_cmpxchg and atomic_inc_n...
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2