Merge by hand (conflicts between pending drivers and kfree cleanups)
[pandora-kernel.git] / drivers / mtd / nand / sharpsl.c
2005-11-08 James BottomleyMerge by hand (conflicts between pending drivers and...
2005-11-08 Linus TorvaldsMerge branch 'release' of git://git./linux/kernel/git...
2005-11-08 Paul MackerrasMerge ../linux-2.6
2005-11-07 Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-mmc
2005-11-07 Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-arm
2005-11-07 Linus TorvaldsMerge /pub/scm/linux/kernel/git/davej/cpufreq
2005-11-07 Linus TorvaldsMerge /pub/scm/linux/kernel/git/davej/agpgart
2005-11-07 Linus TorvaldsMerge branch 'upstream' of git://ftp.linux-mips.org...
2005-11-07 Linus TorvaldsMerge /pub/scm/linux/kernel/git/dtor/input
2005-11-07 Linus TorvaldsMerge /pub/scm/linux/kernel/git/tglx/mtd-2.6
2005-11-07 Thomas Gleixner[MTD] NAND: Clean up trailing white spaces
2005-11-06 Richard Purdie[MTD] NAND sharpsl.c: Add support for akita and borzoi...
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 define-node-cleanup into release branch
2005-10-28 Tony LuckPull update-default-configs into release branch
2005-10-28 Tony LuckPull 1024-cpu into release branch
2005-10-28 Tony LuckPull hp-machvec 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-28 James BottomleyMerge HEAD from ../scsi-misc-2.6-old
2005-10-21 Steve FrenchMerge ... /linux/kernel/git/sfrench/cifs-2.6.git/
2005-10-20 Tony LuckUpdate from upstream with manual merge of Yasunori...
2005-10-06 Jeff GarzikMerge branch 'master'
2005-09-25 Dave Airlieupdate from upstream
2005-09-24 Jeff GarzikMerge /spare/repo/linux-2.6/
2005-09-24 Jeff GarzikMerge /spare/repo/linux-2.6/
2005-09-23 Jeff GarzikMerge /spare/repo/linux-2.6/
2005-09-23 Linus TorvaldsMerge branch 'for-linus' of /linux/kernel/git/shaggy...
2005-09-22 Jeff GarzikMerge /spare/repo/linux-2.6/
2005-09-20 Linus TorvaldsMerge /linux/kernel/git/jejb/scsi-for-linus-2.6
2005-09-19 Anton AltaparmakovMerge branch 'master' of /home/src/linux-2.6/
2005-09-18 David S. MillerMerge /pub/scm/linux/kernel/git/davem/net-2.6
2005-09-17 Richard Purdie[PATCH] MTD: Update SharpSL partition definitions
2005-09-13 Linus TorvaldsMerge /pub/scm/linux/kernel/git/chrisw/lsm-2.6
2005-09-08 Linus TorvaldsMerge kernel.org:/home/rmk/linux-2.6-i2c manually
2005-08-29 Jeff GarzikMerge /spare/repo/linux-2.6/
2005-08-29 Jeff Garzik/spare/repo/libata-dev branch 'v2.6.13'
2005-08-28 James Bottomleyfix mismerge in ll_rw_blk.c
2005-08-18 Dave JonesMerge /pub/scm/linux/kernel/git/torvalds/linux-2.6
2005-08-15 Len BrownMerge 'acpi-2.6.12' branch into to-akpm
2005-08-15 Len BrownMerge ../to-linus-stable/
2005-08-11 Len BrownMerge acpi-2.6.12 to-akpm
2005-08-10 Jeff GarzikMerge /spare/repo/linux-2.6/
2005-08-05 Len Brown[ACPI] Merge acpi-2.6.12 branch into 2.6.13-rc3
2005-08-04 Len Brown/home/lenb/src/to-akpm branch 'acpi-2.6.12'
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 Dave AirlieMerge ../linux-2.6/
2005-07-30 Len Brown/home/lenb/src/to-linus branch 'acpi-2.6.12'
2005-07-29 Linus TorvaldsMerge /pub/scm/linux/kernel/git/dtor/input
2005-07-26 Linus TorvaldsMerge /linux/kernel/git/jejb/scsi-for-linus-2.6
2005-07-23 Luming Yu/home/lenb/linux-2.6 branch 'acpi-2.6.12'
2005-07-13 Jeff GarzikMerge /spare/repo/netdev-2.6 branch 'ieee80211'
2005-07-13 Anton AltaparmakovAutomatic merge with /usr/src/ntfs-2.6.git.
2005-07-13 Jeff GarzikMerge upstream 2.6.13-rc3 into ieee80211 branch of...
2005-07-13 Linus TorvaldsMerge /home/torvalds/linux-2.6-arm
2005-07-13 David WoodhouseMerge with /shiny/git/linux-2.6/.git
2005-07-13 Dave KleikampMerge with /home/shaggy/git/linus-clean/
2005-07-12 Steve FrenchMerge ... /linux/kernel/git/torvalds/linux-2.6.git
2005-07-12 Len Brown[ACPI] merge acpi-2.6.12 branch into latest Linux 2...
2005-07-11 Linus TorvaldsMerge /pub/scm/linux/kernel/git/aegl/linux-2.6
2005-07-11 Linus TorvaldsMerge /pub/scm/linux/kernel/git/tglx/mtd-2.6
2005-07-06 Artem B. BityuckiyMerge with rsync://fileserver/linux
2005-07-06 Thomas Gleixner[MTD] NAND: sharpsl.c set correct file permissions
2005-06-26 Thomas GleixnerMerge with rsync://fileserver/linux
2005-05-23 Thomas GleixnerMerge ... /linux/kernel/git/torvalds/linux-2.6.git
2005-05-23 Richard Purdie[MTD] NAND SharpSL fix default partition size
2005-04-16 Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2