[XFS] Fix merge failures
[pandora-kernel.git] / drivers / isdn / gigaset / ev-layer.c
2008-12-29 Lachlan McIlroy[XFS] Fix merge failures
2008-12-29 Linus TorvaldsMerge branch 'next' of git://git./linux/kernel/git...
2008-12-28 Linus TorvaldsMerge git://git./linux/kernel/git/sam/kbuild-next
2008-12-28 Linus TorvaldsMerge git://git./linux/kernel/git/wim/linux-2.6-nvram
2008-12-28 James MorrisMerge branch 'next' into for-linus
2008-12-28 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-12-28 Linus TorvaldsMerge git://git./linux/kernel/git/davem/net-next-2.6
2008-12-26 Tilman Schmidtgigaset: ifdef cleanup
2008-05-01 Mark M. HoffmanMerge branch 'smsc47b397-new-id' into release
2008-02-18 Lachlan McIlroyMerge git://git./linux/kernel/git/torvalds/linux-2...
2008-02-15 Steve FrenchMerge branch 'master' of /linux/kernel/git/torvalds...
2008-02-11 Linus TorvaldsMerge branch 'for-linus' of git://linux-nfs.org/~bfield...
2008-02-11 Jeff GarzikMerge branch 'r6040' of git://git./linux/kernel/git...
2008-02-09 David S. MillerMerge branch 'pending' of /linux/kernel/git/vxy/lksctp-dev
2008-02-08 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-02-08 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-02-08 Linus TorvaldsMerge branch 'for-linus' of git://oss.sgi.com:8090...
2008-02-07 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-02-07 Linus TorvaldsMerge git://git.infradead.org/mtd-2.6
2008-02-07 Linus TorvaldsMerge branch 'for-2.6.25' of git://git./linux/kernel...
2008-02-07 Len BrownMerge branches 'release' and 'throttling-domains' into...
2008-02-07 Len BrownMerge branches 'release' and 'wmi-2.6.25' into release
2008-02-07 Len BrownMerge branches 'release' and 'menlo' into release
2008-02-07 Len BrownMerge branches 'release' and 'stats' into release
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' and 'dmi' 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 git://git./linux/kernel/git/x86/linux-2.6-x86
2008-02-06 Linus TorvaldsMerge branch 'async-tx-for-linus' of git://lost.foo...
2008-02-06 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-02-06 Linus TorvaldsMerge branch 'upstream-linus' of git://git./linux/kerne...
2008-02-06 Linus TorvaldsMerge git://git./linux/kernel/git/davem/net-2.6
2008-02-06 Linus TorvaldsMerge git://git./linux/kernel/git/davem/sparc-2.6
2008-02-06 Tilman Schmidtgigaset: atomic cleanup
2007-07-22 Len BrownPull battery into release branch
2007-05-10 Linus TorvaldsMerge branch 'juju' of git://git./linux/kernel/git...
2007-05-08 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2007-05-07 Linus TorvaldsMerge branch 'drm-patches' of /linux/kernel/git/airlied...
2007-05-05 Linus TorvaldsMerge /pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
2007-05-01 Wim Van SebroeckMerge /pub/scm/linux/kernel/git/torvalds/linux-2.6
2007-05-01 Dmitry TorokhovMerge /pub/scm/linux/kernel/git/torvalds/linux-2.6
2007-04-30 Tony LuckPull percpu-dtc into release branch
2007-04-30 Tony LuckPull error-inject into release branch
2007-04-29 Len BrownPull sbs into release branch
2007-04-29 Len BrownPull dock into release branch
2007-04-29 Len BrownPull ec into release branch
2007-04-29 Len BrownPull thinkpad into release branch
2007-04-29 Len BrownPull asus into release branch
2007-04-26 David WoodhouseMerge branch 'master' of git://git./linux/kernel/git...
2007-04-23 Paul MackerrasMerge branch 'kconfig' of /linux/kernel/git/galak/power...
2007-04-12 Paul MackerrasMerge branch 'linux-2.6' into for-2.6.22
2007-04-11 Linus TorvaldsMerge branch 'for-2.6.21' of /linux/kernel/git/davej...
2007-04-11 Linus TorvaldsMerge branch 'upstream-fixes' of git://git./linux/kerne...
2007-04-09 Linus TorvaldsMerge branch 'for-2.6.21' of /linux/kernel/git/davej...
2007-04-01 Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-arm
2007-03-29 Linus TorvaldsMerge branch 'upstream-linus' of /linux/kernel/git...
2007-03-29 Linus TorvaldsMerge /pub/scm/linux/kernel/git/davem/net-2.6
2007-03-29 Linus TorvaldsMerge branch 'for-linus' of git://git.kernel.dk/data...
2007-03-29 Tilman Schmidt[PATCH] drivers/isdn/gigaset: mark some static data...
2007-02-26 Linus TorvaldsMerge /pub/scm/linux/kernel/git/davej/cpufreq
2007-02-26 Linus TorvaldsMerge /pub/scm/linux/kernel/git/kyle/parisc-2.6
2007-02-26 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2007-02-26 Linus TorvaldsMerge /pub/scm/linux/kernel/git/davej/agpgart
2007-02-20 Russell KingMerge ARM fixes
2007-02-19 Linus TorvaldsMerge git://git.infradead.org/mtd-2.6
2007-02-19 Linus TorvaldsMerge branch 'for-linus' of /home/rmk/linux-2.6-arm
2007-02-19 Linus TorvaldsMerge branch 'for-linus' of ssh:///linux/kernel/git...
2007-02-17 John W. LinvilleMerge branch 'upstream' into upstream-jgarzik
2007-02-17 Jeff GarzikMerge branch 'gfar' of /linux/kernel/git/galak/powerpc...
2007-02-17 Len BrownPull bugzilla-7897 into release branch
2007-02-17 Len BrownPull bugzilla-7887 into release branch
2007-02-17 Len BrownPull bugzilla-7200 into release branch
2007-02-17 Len BrownPull remove-hotkey into release branch
2007-02-17 Len BrownPull sony into release branch
2007-02-16 Len BrownPull misc-for-upstream into release branch
2007-02-16 Linus TorvaldsMerge /pub/scm/linux/kernel/git/davej/agpgart
2007-02-16 Linus TorvaldsMerge /pub/scm/linux/kernel/git/davej/cpufreq
2007-02-14 Linus TorvaldsMerge branch 'for-linus' of /linux/kernel/git/roland...
2007-02-14 Linus TorvaldsMerge /pub/scm/linux/kernel/git/sfrench/cifs-2.6
2007-02-14 Linus TorvaldsMerge branch 'upstream' of git://ftp.linux-mips.org...
2007-02-14 Linus TorvaldsMerge /linux/kernel/git/wim/linux-2.6-watchdog
2007-02-13 Trond MyklebustMerge branch 'master' of /home/trondmy/kernel/linux...
2007-02-13 Kumar GalaMerge branch 'master' into 85xx
2007-02-13 Kumar GalaMerge branch 'master' into 83xx
2007-02-13 Kumar GalaMerge branch 'master' into for_paulus
2007-02-13 Paul MackerrasMerge branch 'for_paulus' of /linux/kernel/git/galak...
2007-02-12 Linus TorvaldsMerge branch 'for-linus' of git://git390.osdl.marist...
2007-02-12 Tilman Schmidt[PATCH] drivers/isdn/gigaset: new M101 driver (v2)
2006-09-30 Linus TorvaldsMerge branch 'intelfb-patches' of /linux/kernel/git...
2006-09-26 Tony LuckPull esi-support into release branch
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...
next