merge by hand (qla_os.c mismerge)
[powerpc.git] / include / asm-arm26 / elf.h
2005-06-17 James Bottomleymerge by hand (fix up qla_os.c merge error)
2005-06-11 Linus TorvaldsMerge /pub/scm/linux/kernel/git/airlied/drm-2.6
2005-06-09 Steve FrenchMerge ... /linux/kernel/git/torvalds/linux-2.6.git
2005-06-08 Linus TorvaldsMerge /pub/scm/linux/kernel/git/aegl/linux-2.6
2005-06-08 Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-serial
2005-06-08 Linus TorvaldsMerge ... kernel.org:/home/rmk/linux-2.6-arm
2005-06-03 Mike Frysinger[PATCH] ARM: 2696/1: remove ';' in ELF_DATA define...
2005-04-16 Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2