[XFS] Fix merge failures
[pandora-kernel.git] / include / linux / if_frad.h
2008-05-01 Mark M. HoffmanMerge branch 'smsc47b397-new-id' into release
2008-02-07 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-02-07 Len BrownMerge branches 'release', 'misc' and 'misc-2.6.25'...
2008-02-07 Len BrownMerge branches 'release' and 'ppc-workaround' into...
2008-02-07 Len BrownMerge branches 'release' and 'hp-cid' into release
2008-02-07 Len BrownMerge branches 'release' and 'gpe-ack' into release
2008-02-07 Len BrownMerge branches 'release', 'cpuidle-2.6.25' and 'idle...
2008-02-07 Len BrownMerge branches 'release', 'bugzilla-6217', 'bugzilla...
2008-02-07 Len BrownMerge branches 'release' and 'autoload' into release
2008-02-07 Len BrownMerge branches 'release', 'asus', 'sony-laptop' and...
2008-02-07 Len BrownMerge branches 'release', 'acpi_pm_device_sleep_state...
2008-02-06 Linus TorvaldsMerge branch 'dmapool' of git://git./linux/kernel/git...
2008-02-03 David WoodhouseMerge git://git.infradead.org/~dedekind/ubi-2.6
2008-02-03 David WoodhouseMerge git://git.infradead.org/~kmpark/onenand-mtd-2.6
2008-02-03 David WoodhouseMerge git://git./linux/kernel/git/torvalds/linux-2...
2008-02-01 Linus TorvaldsMerge branch 'task_killable' of git://git./linux/kernel...
2008-01-31 Paul MackerrasMerge branch 'linux-2.6'
2008-01-30 Linus TorvaldsMerge git://git./linux/kernel/git/gregkh/driver-2.6
2008-01-29 Linus TorvaldsMerge git://git./linux/kernel/git/davem/net-2.6.25
2008-01-28 Al Viroannotate the rest of drivers/net/wan
2006-09-26 Tony LuckPull model-name into release branch
2006-07-15 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2006-07-05 Jeff GarzikMerge branch 'upstream' of git://lost.foo-projects...
2006-07-04 Linus TorvaldsMerge branch 'devel' of /home/rmk/linux-2.6-serial
2006-07-03 Steven WhitehouseMerge git./linux/kernel/git/torvalds/linux-2.6
2006-06-29 Dave JonesMerge ../linus
2006-06-28 Linus TorvaldsMerge /linux/kernel/git/wim/linux-2.6-watchdog
2006-06-26 Linus TorvaldsMerge git://git./linux/kernel/git/sam/kbuild
2006-06-26 Dmitry TorokhovMerge /pub/scm/linux/kernel/git/torvalds/linux-2.6
2006-06-25 Steve FrenchMerge ... /linux/kernel/git/torvalds/linux-2.6.git
2006-06-24 Russell KingMerge signal handler branch
2006-06-23 Linus TorvaldsMerge branch 'release' of git://git./linux/kernel/git...
2006-06-23 Linus TorvaldsMerge branch 'devel' of /home/rmk/linux-2.6-mmc
2006-06-23 Linus TorvaldsMerge branch 'devel' of /home/rmk/linux-2.6-serial
2006-06-23 Linus TorvaldsMerge /pub/scm/linux/kernel/git/davej/cpufreq
2006-06-23 Linus TorvaldsMerge git://git./linux/kernel/git/paulus/powerpc
2006-06-23 Jeff GarzikMerge branch 'upstream' of git://electric-eye.fr.zoreil...
2006-06-23 Jeff GarzikMerge branch 'master' into upstream
2006-06-23 Jeff GarzikMerge branch 'master' into upstream
2006-06-22 Linus TorvaldsMerge git://oss.sgi.com:8090/xfs-2.6
2006-06-21 Tony LuckPull rework-memory-attribute-aliasing into release...
2006-06-21 Linus TorvaldsMerge /pub/scm/linux/kernel/git/gregkh/pci-2.6
2006-06-21 Linus TorvaldsMerge /pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
2006-06-21 Linus TorvaldsMerge git://git./linux/kernel/git/bcollins/linux1394-2.6
2006-06-21 Linus TorvaldsMerge branch 'devel' of /home/rmk/linux-2.6-arm
2006-06-21 Trond MyklebustMerge branch 'master' of /home/trondmy/kernel/linux...
2006-06-21 Linus TorvaldsMerge /pub/scm/linux/kernel/git/davem/net-2.6
2006-06-21 Linus TorvaldsMerge /pub/scm/linux/kernel/git/davem/sparc-2.6
2006-06-20 Linus TorvaldsMerge branch 'rio.b19' of git://git./linux/kernel/git...
2006-06-20 Linus TorvaldsMerge branch 'audit.b21' of git://git./linux/kernel...
2006-06-20 Linus TorvaldsMerge git://git.infradead.org/hdrcleanup-2.6
2006-05-24 David WoodhouseMerge branch 'master' of git://git./linux/kernel/git...
2006-05-06 David WoodhouseMerge git://git./linux/kernel/git/torvalds/linux-2.6
2006-05-01 David WoodhouseMerge git://git./linux/kernel/git/torvalds/linux-2.6
2006-04-30 David WoodhouseMerge git://git./linux/kernel/git/torvalds/linux-2.6
2006-04-29 David WoodhouseMerge git://git./linux/kernel/git/torvalds/linux-2.6
2006-04-26 David WoodhouseDon't include linux/config.h from anywhere else in...
2006-03-21 Tony LuckPull bsp-removal into release branch
2006-02-01 Linus TorvaldsMerge /pub/scm/linux/kernel/git/davej/x86
2006-01-27 Len BrownPull release into acpica branch
2006-01-24 Len Brown[ACPI] merge 3549 4320 4485 4588 4980 5483 5651 acpica...
2006-01-24 Dave KleikampMerge with /home/shaggy/git/linus-clean/
2006-01-19 Anton AltaparmakovMerge branch 'master' of /usr/src/ntfs-2.6/
2006-01-17 Jeff GarzikMerge branch 'upstream'
2006-01-17 Jeff GarzikMerge branch 'upstream'
2006-01-14 Linus TorvaldsMerge /pub/scm/linux/kernel/git/dtor/input
2006-01-12 Steve FrenchMerge ... /linux/kernel/git/torvalds/linux-2.6.git
2006-01-12 Linus TorvaldsMerge branch 'drm-forlinus' of git://git./linux/kernel...
2006-01-10 Linus TorvaldsMerge git://git./linux/kernel/git/dtor/input
2006-01-10 Linus TorvaldsMerge ssh:///pub/scm/linux/kernel/git/sam/kbuild
2006-01-09 Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-serial
2006-01-09 Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-mmc
2006-01-09 Russell KingMerge Linus' tree.
2006-01-09 Linus TorvaldsMerge git://git./linux/kernel/git/paulus/powerpc-merge
2006-01-09 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2006-01-09 Jan Blunck[PATCH] Eliminate __attribute__ ((packed)) warnings...
2005-11-06 Thomas GleixnerMerge branch 'master' of /home/tglx/work/mtd/git/linux...
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-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 James BottomleyMerge HEAD from ../scsi-iscsi-2.6
2005-09-08 Jeff GarzikMerge /spare/repo/linux-2.6/
2005-09-08 Linus TorvaldsMerge /linux/kernel/git/jejb/scsi-for-linus-2.6
2005-09-06 Linus TorvaldsMerge /pub/scm/linux/kernel/git/sam/kbuild
2005-09-04 Dmitry TorokhovMerge HEAD from /linux/kernel/git/torvalds/linux-2...
2005-09-03 Len BrownMerge linux-2.6 into linux-acpi-2.6 test
2005-09-02 Linus TorvaldsMerge HEAD from kernel.org:/home/rmk/linux-2.6-arm
2005-09-01 Jeff Garzik/spare/repo/netdev-2.6 branch 'ieee80211'
2005-09-01 Jeff Garzik/spare/repo/netdev-2.6 branch 'master'
2005-09-01 Linus TorvaldsMerge HEAD from /home/rmk/linux-2.6-arm.git
2005-08-31 Russell King[SERIAL] Clean up and fix tty transmission start/stoping
2005-08-30 Steve FrenchMerge ... /linux/kernel/git/torvalds/linux-2.6.git
2005-08-30 Jeff GarzikMerge HEAD from /spare/repo/linux-2.6/.git
2005-08-30 Tony LuckAuto-update from upstream
2005-08-30 Linus TorvaldsMerge refs/heads/for-linus from /linux/kernel/git/shagg...
2005-08-30 Linus TorvaldsMerge refs/heads/drm-latest from /linux/kernel/git...
2005-08-30 Jeff Garzik/spare/repo/libata-dev branch 'master'
2005-08-30 Jeff Garzik/spare/repo/libata-dev branch 'master'
next