Merge branch 'from-linus' into bcm43xx
[linux-2.6] / arch / sparc / prom / sun4prom.c
2005-06-15  Tony LuckAuto merge with /home/aegl/GIT/linus
2005-05-20  James Bottomleymerge by hand - fix up rejections in Documentation...
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  Anton AltaparmakovMerge with /usr/src/ntfs-2.6.git
2005-05-04  Dave KleikampMerge with /home/shaggy/git/linus-clean/
2005-05-04  Linus TorvaldsMerge ... /linux/kernel/git/shaggy/jfs-2.6.git/
2005-05-04  Al Viro[PATCH] sparc NULL noise removal
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2