[XFS] Fix merge failures
[pandora-kernel.git] / arch / sh / drivers / dma / Makefile
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-28 Linus TorvaldsMerge git://git./linux/kernel/git/sfrench/cifs-2.6
2008-12-28 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-12-28 Linus TorvaldsMerge branch 'for-linus' of git://git390.osdl.marist...
2008-12-28 Linus TorvaldsMerge branch 'sched-core-for-linus' of git://git./linux...
2008-12-28 Linus TorvaldsMerge branch 'tracing-core-for-linus' of git://git...
2008-12-28 Linus TorvaldsMerge branch 'x86-core-for-linus' of git://git./linux...
2008-12-28 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-12-28 Linus TorvaldsMerge git://git./linux/kernel/git/herbert/crypto-2.6
2008-12-28 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-12-28 Linus TorvaldsMerge git://git./linux/kernel/git/lethal/sh-2.6
2008-12-22 Paul Mundtsh: dma: Kill off ISA DMA wrapper.
2007-07-22 Len BrownPull video into release branch
2007-07-22 Len BrownPull battery into release branch
2007-07-05 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2007-06-13 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2007-06-05 Linus TorvaldsMerge git://git.infradead.org/mtd-2.6
2007-06-04 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2007-05-23 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2007-05-11 Linus TorvaldsMerge branch 'master' of ssh:///linux/kernel/git/mcheha...
2007-05-11 Wim Van SebroeckMerge /pub/scm/linux/kernel/git/torvalds/linux-2.6
2007-05-11 Linus TorvaldsMerge branch 'upstream-fixes' of /linux/kernel/git...
2007-05-10 Linus TorvaldsMerge /linux/kernel/git/wim/linux-2.6-watchdog
2007-05-10 Linus TorvaldsMerge /pub/scm/linux/kernel/git/davem/sparc-2.6
2007-05-10 Linus TorvaldsMerge branch 'juju' of git://git./linux/kernel/git...
2007-05-10 Paul MackerrasMerge branch 'linux-2.6'
2007-05-10 Len BrownPull thermal into release branch
2007-05-10 Linus TorvaldsMerge branch 'for-linus' of /linux/kernel/git/roland...
2007-05-09 Jeff GarzikMerge branch 'upstream' of git://git./linux/kernel...
2007-05-09 Linus TorvaldsMerge /pub/scm/linux/kernel/git/bart/ide-2.6
2007-05-09 Linus TorvaldsMerge git://git./linux/kernel/git/aegl/linux-2.6
2007-05-09 Linus TorvaldsMerge git://git.infradead.org/mtd-2.6
2007-05-09 Linus TorvaldsMerge /pub/scm/linux/kernel/git/lethal/sh-2.6
2007-05-09 Manuel Lausssh: SH7760 DMABRG support.
2007-02-03 Len BrownPull video into test branch
2007-01-17 David WoodhouseMerge branch 'master' of git://git./linux/kernel/git...
2006-12-20 Len BrownPull bugfix into test branch
2006-12-20 Len BrownPull platform-drivers into test branch
2006-12-16 Len BrownPull style into test branch
2006-12-16 Len BrownPull bugfix into test branch
2006-12-16 Len BrownPull trivial into test branch
2006-12-16 Len BrownPull platform-drivers into test branch
2006-12-16 Len BrownPull button into test branch
2006-12-16 Len BrownPull dock into test branch
2006-12-13 Russell King[ARM] Merge AT91 and devel branches
2006-12-12 Dave JonesMerge ../linus
2006-12-12 Dave JonesMerge ../linus
2006-12-12 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2006-12-08 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2006-12-08 Dmitry TorokhovMerge /pub/scm/linux/kernel/git/torvalds/linux-2.6
2006-12-07 Linus TorvaldsMerge branch 'for-linus' of /home/rmk/linux-2.6-arm
2006-12-07 Linus TorvaldsMerge branch 'intx' of /linux/kernel/git/jgarzik/misc-2.6
2006-12-07 Trond MyklebustMerge branch 'master' of /home/trondmy/kernel/linux...
2006-12-07 Linus TorvaldsMerge /pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw
2006-12-07 Linus TorvaldsMerge branch 'for-linus' of git://one.firstfloor.org...
2006-12-07 Jeff GarzikMerge tag 'r8169-upstream-20061204-00' of git://electri...
2006-12-07 Jeff GarzikMerge branch 'upstream' of git://git./linux/kernel...
2006-12-07 Jeff GarzikMerge branch 'master' into upstream
2006-12-07 Linus TorvaldsMerge branch 'upstream' of git://ftp.linux-mips.org...
2006-12-06 Linus TorvaldsMerge /pub/scm/linux/kernel/git/lethal/sh-2.6
2006-12-06 Paul Mundtsh: Make dma-isa depend on ISA_DMA_API.
2005-04-16 Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2