Manual merge with Linus (conflict in drivers/input/misc/wistron_bnts.c)
[linux-2.6] / include / asm-arm / arch-ebsa110 /
2005-11-22  Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2005-11-22  Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-serial
2005-11-22  Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-arm
2005-11-21  Russell King[ARM] ebsa110: __arch_ioremap should be 3 args
2005-11-21  David S. MillerMerge git://git.skbuff.net/gitroot/yoshfuji/linux-2...
2005-11-11  Jeff GarzikMerge branch 'atmel'
2005-11-07  Linus TorvaldsMerge /pub/scm/linux/kernel/git/davej/cpufreq
2005-11-07  Linus TorvaldsMerge /pub/scm/linux/kernel/git/davej/agpgart
2005-11-06  Thomas GleixnerMerge branch 'master' of /home/tglx/work/mtd/git/linux...
2005-11-05  James BottomleyMerge by Hand
2005-11-05  Linus TorvaldsMerge branch 'srp' of /linux/kernel/git/roland/infiniband
2005-11-05  Linus TorvaldsMerge branch 'for-linus' of /linux/kernel/git/roland...
2005-11-02  Linus TorvaldsMerge /pub/scm/linux/kernel/git/airlied/drm-2.6
2005-10-31  Tony Luckmanual update from upstream:
2005-10-31  Steve FrenchMerge ... /linux/kernel/git/torvalds/linux-2.6.git
2005-10-31  Linus TorvaldsMerge kernel.org:/home/rmk/linux-2.6-drvmodel
2005-10-31  Paul MackerrasMerge ../linux-2.6 by hand
2005-10-30  Anton AltaparmakovMerge branch 'master' of /usr/src/ntfs-2.6/
2005-10-29  Jeff GarzikMerge branch 'master'
2005-10-29  Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-arm
2005-10-29  Nicolas Pitre[ARM] 3060/1: allow constants found in asm/memory.h...
2005-10-28  Russell King[ARM] 2/4: Remove asm/hardware.h from asm-arm/arch...
2005-10-28  Russell King[ARM] 1/4: Move include of asm/hardware.h to asm-arm...
2005-05-20  James Bottomleymerge by hand - fix up rejections in Documentation...
2005-05-17  Tony LuckMerge ... temp tree to get David's gdb inferior calls...
2005-05-06  Linus TorvaldsMerge ... parisc-linux.org/~jejb/git/scsi-for-linus...
2005-05-05  David WoodhouseMerge ... /linux/kernel/git/torvalds/linux-2.6.git
2005-05-05  Linus TorvaldsMerge ... /linux/kernel/git/aegl/linux-2.6.git
2005-05-04  Linus TorvaldsMerge ... /linux/kernel/git/davem/net-2.6.git/
2005-05-03  Linus TorvaldsMerge ... kernel.org:/home/rmk/linux-2.6-rmk.git
2005-05-03  Russell King[PATCH] ARM: cleanup vmalloc start/offset macros
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2