[GFS2] Fix up merge of Linus' kernel into GFS2
[pandora-kernel.git] / drivers / net / pcmcia / xirc2ps_cs.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: const-ify ethtool_ops declarations
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' into upstream
2006-08-24 Jeff GarzikMerge branch 'upstream-fixes' of git://git./linux/kerne...
2006-08-24 Joerg Ahrens[PATCH] xirc2ps_cs: Cannot reset card in atomic context
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 git://git.infradead.org/hdrinstall-2.6
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 David WoodhouseMerge branch 'master' of git://git./linux/kernel/git...
2006-06-26 Dmitry TorokhovMerge /pub/scm/linux/kernel/git/torvalds/linux-2.6
2006-06-25 Linus TorvaldsMerge branch 'for-linus' of /linux/kernel/git/roland...
2006-06-25 Steve FrenchMerge ... /linux/kernel/git/torvalds/linux-2.6.git
2006-06-24 Russell KingMerge signal handler branch
2006-06-24 Trond MyklebustMerge branch 'master' of /home/trondmy/kernel/linux...
2006-06-23 Linus TorvaldsMerge branch 'upstream-linus' of /linux/kernel/git...
2006-06-23 Tony LuckAuto-update from upstream
2006-06-23 Linus TorvaldsMerge /pub/scm/linux/kernel/git/davem/net-2.6
2006-06-23 Linus TorvaldsMerge branch 'release' of git://git./linux/kernel/git...
2006-06-23 Herbert Xu[NET]: Avoid allocating skb in skb_pad
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-arm
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 branch 'upstream-linus' of /linux/kernel/git...
2006-06-23 Jeff GarzikMerge branch 'upstream' of git://electric-eye.fr.zoreil...
2006-06-23 Eric Sesterhenn[PATCH] Remove useless check in drivers/net/pcmcia...
2006-06-16 Len BrownPull bugzilla-5737 into release branch
2006-06-16 Len BrownPull acpi_bus_register_driver into release branch
2006-06-15 Len BrownPull bugzilla-5452 into release branch
2006-06-15 Len BrownPull bugzilla-5653 into release branch
2006-06-15 Len BrownPull trivial into release branch
2006-06-15 Len BrownPull novell-bugzilla-156426 into release branch
2006-06-15 Len BrownPull trivial1 into release branch
2006-06-15 Len BrownPull pnpacpi into release branch
2006-06-15 Len BrownPull motherboard into release branch
2006-06-15 Len BrownPull Kconfig into release branch
2006-06-15 Len BrownPull ec into release branch
2006-06-15 Len BrownPull cpu-hotplug into release branch
2006-06-15 Len BrownPull address_range into release branch
2006-06-15 Len BrownPull acpica into release branch
2006-04-29 Dmitry TorokhovMerge /pub/scm/linux/kernel/git/torvalds/linux-2.6
2006-04-18 Dave JonesMerge ../linus
2006-04-12 Jeff GarzikMerge branch 'master'
2006-04-12 Jeff GarzikMerge branch 'upstream'
2006-04-04 Kumar GalaMerge branch 'master'
2006-04-04 Jeff GarzikMerge branch 'upstream'
2006-04-04 Jeff GarzikMerge branch 'master'
2006-04-03 Steven WhitehouseMerge branch 'master'
2006-04-02 Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-arm
2006-04-02 Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-mmc
2006-04-02 Linus TorvaldsMerge git://oss.sgi.com:8090/oss/git/xfs-2.6
2006-04-02 Linus TorvaldsMerge /pub/scm/linux/kernel/git/perex/alsa
2006-04-02 Linus TorvaldsMerge /linux/kernel/git/wim/linux-2.6-watchdog
2006-04-02 Linus TorvaldsMerge git://git./linux/kernel/git/bunk/trivial
2006-04-02 Linus TorvaldsMerge /pub/scm/linux/kernel/git/mchehab/v4l-dvb
2006-04-02 Linus TorvaldsMerge branch 'for-linus' of /linux/kernel/git/roland...
2006-04-02 Linus TorvaldsMerge /pub/scm/linux/kernel/git/brodo/pcmcia-2.6
2006-04-02 Dmitry TorokhovManual merge with Linus.
2006-04-01 Jeff GarzikMerge branch 'upstream'
2006-04-01 Paul MackerrasMerge branch 'for_paulus' of git://git./linux/kernel...
2006-04-01 Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-serial
2006-04-01 Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-mmc
2006-04-01 Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-arm
2006-04-01 Linus TorvaldsMerge branch 'release' of git://git./linux/kernel/git...
2006-04-01 Linus TorvaldsMerge /pub/scm/linux/kernel/git/sfrench/cifs-2.6
2006-03-31 Linus TorvaldsMerge /pub/scm/linux/kernel/git/davem/net-2.6
next