[GFS2] Fix up merge of Linus' kernel into GFS2
[pandora-kernel.git] / drivers / net / ac3200.c
2006-09-25 Steven Whitehouse[GFS2] Fix up merge of Linus' kernel into GFS2
2006-09-24 Linus TorvaldsMerge git://git./linux/kernel/git/sam/kbuild
2006-09-24 David WoodhouseMerge branch 'master' of git://git./linux/kernel/git...
2006-09-24 Linus TorvaldsMerge branch 'upstream-linus' of /linux/kernel/git...
2006-09-24 Linus TorvaldsMerge branch 'upstream-linus' of /linux/kernel/git...
2006-09-23 Jeff GarzikMerge tag 'r8169-20060920-00' of git://electric-eye...
2006-09-23 Jeff GarzikMerge branch 'master' into upstream
2006-09-21 Jeff GarzikMerge branch 'upstream-fixes' into upstream
2006-09-20 Jeff GarzikMerge branch 'master' into upstream
2006-09-19 Jeff GarzikMerge branch 'master' into upstream
2006-09-17 Jeff GarzikMerge branch 'upstream-fixes' into upstream
2006-09-17 Jeff GarzikMerge branch 'upstream-fixes' into upstream
2006-09-13 Jeff Garzikdrivers/net: Trim trailing whitespace
2006-09-13 Jeff GarzikMerge tag 'r8169-20060912-00' of git://electric-eye...
2006-09-05 Dave JonesMerge ../linus
2006-09-05 Dave JonesMerge ../linus
2006-08-31 Paul MackerrasMerge branch 'merge'
2006-08-31 Linus TorvaldsMerge branch 'merge' of git://git./linux/kernel/git...
2006-08-31 Linus TorvaldsMerge branch 'release' of git://git./linux/kernel/git...
2006-08-30 David WoodhouseMerge branch 'master' of git://git./linux/kernel/git...
2006-08-29 Linus TorvaldsMerge git://git./linux/kernel/git/sfrench/cifs-2.6
2006-08-29 Jeff GarzikMerge /spare/repo/linux-2.6 into upstream
2006-08-29 John W. LinvilleMerge branch 'from-linus' into upstream
2006-08-29 Steven WhitehouseMerge branch 'master' into gfs2
2006-08-28 James BottomleyMerge ../linux-2.6
2006-08-26 Greg Kroah-HartmanMerge gregkh@/linux/kernel/git/jejb/scsi-rc-fixes-2.6
2006-08-25 Greg Kroah-HartmanMerge branch 'fixes' of git://git.linux-nfs.org/pub...
2006-08-24 Greg Kroah-HartmanMerge branch 'for-linus' of git://git390.osdl.marist...
2006-08-24 Greg Kroah-HartmanMerge branch 'upstream-greg' of gregkh@/linux/kernel...
2006-08-24 Greg Kroah-HartmanMerge branch 'upstream-greg' of gregkh@/linux/kernel...
2006-08-24 Jeff GarzikMerge branch 'upstream-fixes' of git://lost.foo-project...
2006-08-24 Jeff GarzikMerge branch 'upstream-fixes' of git://git./linux/kerne...
2006-08-19 Jeff GarzikMerge branch 'upstream' of git://git./linux/kernel...
2006-08-19 Jeff GarzikMerge branch 'upstream-fixes' into upstream
2006-08-19 Andrew Morton[PATCH] ac3200 section fixes
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-13 Linus TorvaldsMerge branch 'for-linus' of /linux/kernel/git/roland...
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-arm
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 Linus TorvaldsMerge /pub/scm/linux/kernel/git/mchehab/v4l-dvb
2006-01-09 Linus TorvaldsMerge git://git./linux/kernel/git/paulus/powerpc-merge
2006-01-09 Linus TorvaldsMerge branch 'upstream-linus' of /linux/kernel/git...
2006-01-09 Linus TorvaldsMerge branch 'upstream-linus' of /linux/kernel/git...
2006-01-09 Denis Vlasenko[PATCH] fix a few "warning: 'cleanup_card' defined...
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-07 viro@ftp.linux.org.uk[PATCH] iomem annotations (ac3200.c)
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'
next