[XFS] Fix merge conflict in fs/xfs/xfs_rename.c
[linux-2.6] / drivers / pcmcia / yenta_socket.h
2005-11-06  Thomas GleixnerMerge branch 'master' of /home/tglx/work/mtd/git/linux...
2005-10-28  Tony LuckPull xpc-disengage into release branch
2005-10-28  Tony LuckPull new-efi-memmap into release branch
2005-10-28  Tony LuckPull altix-mmr into release branch
2005-10-28  Tony LuckPull altix-fpga-reset into release branch
2005-10-21  Steve FrenchMerge ... /linux/kernel/git/sfrench/cifs-2.6.git/
2005-09-25  Dave Airlieupdate from upstream
2005-09-14  Jeff GarzikMerge /spare/repo/linux-2.6/
2005-09-13  Linus TorvaldsMerge /pub/scm/linux/kernel/git/chrisw/lsm-2.6
2005-09-13  Linus TorvaldsMerge /pub/scm/linux/kernel/git/dwmw2/audit-2.6
2005-09-11  Tony LuckPull sn-features into release branch
2005-09-11  Tony LuckPull sim-fixes into release branch
2005-09-11  Linus TorvaldsMerge /pub/scm/linux/kernel/git/roland/infiniband
2005-09-11  Linus TorvaldsMerge branch 'for-linus' from /.../shaggy/jfs-2.6 manually
2005-09-10  Dmitry TorokhovManual merge with Linus
2005-09-09  Linus TorvaldsMerge /pub/scm/linux/kernel/git/davej/cpufreq
2005-09-09  Linus TorvaldsMerge /pub/scm/linux/kernel/git/davej/agpgart
2005-09-08  Linus TorvaldsMerge kernel.org:/home/rmk/linux-2.6-i2c manually
2005-09-08  Tony Luck[IA64] Manual merge fix for 3 files
2005-09-08  David S. MillerMerge git://git.skbuff.net/gitroot/yoshfuji/linux-2...
2005-09-08  James BottomleyMerge HEAD from ../scsi-iscsi-2.6
2005-09-08  Jeff GarzikMerge /spare/repo/linux-2.6/
2005-09-08  Jeff GarzikMerge /spare/repo/linux-2.6/
2005-09-08  Jeff GarzikMerge /spare/repo/linux-2.6/
2005-09-08  Jeff GarzikMerge /spare/repo/linux-2.6/
2005-09-08  Len BrownMerge linux-2.6 with linux-acpi-2.6
2005-09-08  Linus TorvaldsMerge /linux/kernel/git/jejb/scsi-for-linus-2.6
2005-09-08  Linus TorvaldsMerge branch 'drm-fixes' of /linux/kernel/git/airlied...
2005-09-08  Linus TorvaldsMerge branch 'upstream' of /linux/kernel/git/jgarzik...
2005-09-08  Linus TorvaldsMerge branch 'upstream' of /linux/kernel/git/jgarzik...
2005-09-08  Linus TorvaldsMerge git://oss.sgi.com:8090/oss/git/xfs-2.6
2005-09-08  Linus TorvaldsMerge branch 'upstream' of /linux/kernel/git/jgarzik...
2005-09-08  Linus TorvaldsMerge /pub/scm/linux/kernel/git/davem/sparc-2.6
2005-09-08  Linus TorvaldsMerge /pub/scm/linux/kernel/git/davem/net-2.6
2005-09-08  Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-serial
2005-09-08  Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-arm
2005-09-07  Daniel Ritz[PATCH] yenta: make ToPIC95 bridges work with 16bit...
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2