Merge by hand (conflicts in sr.c)
[linux-2.6] / scripts / mod / modpost.c
2005-08-28  James BottomleyMerge by hand (conflicts in sr.c)
2005-08-28  James BottomleyMerge HEAD from ../scsi-misc-2.6-tmp
2005-08-28  James Bottomleyfix mismerge in ll_rw_blk.c
2005-08-23  Tony LuckPull prarit-bus-sysdata into release branch
2005-08-22  Tony LuckAuto-update from upstream
2005-08-20  Linus TorvaldsMerge /pub/scm/linux/kernel/git/davem/net-2.6
2005-08-20  Linus TorvaldsMerge /pub/scm/linux/kernel/git/davem/sparc-2.6
2005-08-19  Ben Colline[SPARC]: Deal with glibc changing macro names in modpost.c
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2