Merge by hand (conflicts in sr.c)
[linux-2.6] / ipc / shm.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-15  Len BrownMerge ../to-linus-stable/
2005-08-04  Dave KleikampMerge with /home/shaggy/git/linus-clean/
2005-08-04  Linus TorvaldsMerge /linux/kernel/git/jejb/scsi-for-linus-2.6
2005-08-04  Linus TorvaldsMerge head 'for-linus' of /linux/kernel/git/roland...
2005-08-04  Len Brown/home/lenb/src/to-linus-stable branch 'acpi-2.6.12'
2005-08-03  Len Brown/home/lenb/src/to-linus branch 'acpi-2.6.12'
2005-08-02  Andrew Morton[PATCH] shm: CONFIG_SHMEM=n build fix
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-03  David WoodhouseMerge ... /linux/kernel/git/torvalds/linux-2.6.git
2005-05-01  Stephen Rothwell[PATCH] consolidate sys_shmat
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2