]> Pileus Git - ~andy/linux/history - drivers/pcmcia/sa1100_jornada720.c
Merge by hand (conflicts in sd.c)
[~andy/linux] / drivers / pcmcia / sa1100_jornada720.c
2005-08-28 James Bottomleyfix mismerge in ll_rw_blk.c
2005-08-15 Len BrownMerge ../to-linus-stable/
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-07-30 Len Brown/home/lenb/src/to-linus branch 'acpi-2.6.12'
2005-07-29 Linus TorvaldsMerge master.kernel.org:/pub/scm/linux/kernel/git/davej...
2005-07-29 Linus TorvaldsMerge master.kernel.org:/pub/scm/linux/kernel/git/davej...
2005-07-29 Linus TorvaldsMerge master.kernel.org:/pub/scm/linux/kernel/git/dtor...
2005-07-29 Linus TorvaldsMerge head 'upstream' of master.kernel.org:/pub/scm...
2005-07-27 Linus TorvaldsMerge head 'for-linus' of master.kernel.org:/pub/scm...
2005-07-27 Dave KleikampMerge with /home/shaggy/git/linus-clean/
2005-07-27 Tony LuckAuto merge with /home/aegl/GIT/linus
2005-07-26 Linus TorvaldsMerge master.kernel.org:/pub/scm/linux/kernel/git/davem...
2005-07-26 Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-arm
2005-07-26 Michael Gernoth[PATCH] ARM: 2830/1: Fix Jornada 720 PCMCIA-support
2005-04-16 Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2