Manual merge with Linus (conflict in drivers/input/misc/wistron_bnts.c)
[linux-2.6] / include / asm-arm / arch-omap / vmalloc.h
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