[XFS] Fix merge failures
[pandora-kernel.git] / drivers / net / hamradio / scc.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-25 Takashi IwaiMerge branch 'topic/snd-hrtimer' into to-push
2008-12-25 Takashi IwaiMerge branch 'topic/jack-mechanical' into to-push
2008-12-25 Takashi IwaiMerge branch 'topic/aoa' into to-push
2008-12-24 David S. MillerMerge branch 'master' of /linux/kernel/git/davem/net-2.6
2008-12-20 Takashi IwaiMerge branch 'topic/pcsp-fix' into topic/misc
2008-12-19 Takashi IwaiMerge branch 'fix/hda' into topic/hda
2008-12-16 David S. MillerMerge branch 'master' of /linux/kernel/git/davem/net-2.6
2008-12-16 David S. MillerMerge branch 'master' of /linux/kernel/git/davem/net-2.6
2008-12-06 David S. MillerMerge branch 'master' of /linux/kernel/git/davem/net-2.6
2008-12-03 David S. MillerMerge branch 'master' of /linux/kernel/git/davem/net-2.6
2008-12-03 David S. MillerMerge branch 'master' of /linux/kernel/git/davem/net-2.6
2008-11-30 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-11-28 David S. MillerMerge branch 'master' of git://git./linux/kernel/git...
2008-11-27 David S. MillerMerge branch 'master' of /linux/kernel/git/davem/net-2.6
2008-11-26 Takashi IwaiMerge branch 'topic/misc' into topic/pcsp-fix
2008-11-25 Takashi IwaiMerge branch 'topic/fix/hda' into for-linus
2008-11-24 Paul MackerrasMerge branch 'merge' of git://git./linux/kernel/git...
2008-11-21 Takashi IwaiMerge branches 'topic/fix/hda' and 'topic/fix/sound...
2008-11-21 David S. MillerMerge branch 'master' of /linux/kernel/git/davem/net-2.6
2008-11-20 Wang Chennetdevice hamradio: Convert directly reference of netde...
2008-11-19 David S. MillerMerge branch 'master' of /linux/kernel/git/davem/net-2.6
2008-11-18 Takashi IwaiMerge branches 'topic/fix/hda' and 'topic/fix/misc...
2008-11-12 Takashi IwaiMerge branch 'topic/fix/hda' into for-linus
2008-11-11 David S. MillerMerge branch 'master' of /linux/kernel/git/davem/net-2.6
2008-11-10 Takashi IwaiMerge branches 'topic/fix/misc' and 'topic/fix/hda...
2008-11-07 David S. MillerMerge branch 'master' of /linux/kernel/git/davem/net-2.6
2008-11-06 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-11-06 Ingo MolnarMerge branch 'iommu-fixes-2.6.28' of git://git./linux...
2008-11-05 James MorrisMerge branch 'master' into next
2008-11-04 David S. Millerdrivers/net: Kill now superfluous ->last_rx stores.
2008-11-03 Takashi IwaiMerge branches 'topic/fix/misc' and 'topic/fix/hda...
2008-10-31 Takashi IwaiMerge commit 'v2.6.28-rc2' into topic/asoc
2008-10-30 Linus TorvaldsMerge git://git./linux/kernel/git/brodo/pcmcia-2.6
2008-10-30 Takashi IwaiMerge branches 'topic/fix/misc' and 'topic/fix/asoc...
2008-10-29 Takashi IwaiMerge branches 'topic/fix/hda' and 'topic/fix/misc...
2008-10-28 Ingo MolnarMerge commit 'v2.6.28-rc2' into x86/pci-ioapic-boot...
2008-10-28 Paul MundtMerge branches 'sh/serial-rework' and 'sh/oprofile'
2008-10-27 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-10-27 Takashi IwaiMerge branches 'topic/fix/asoc', 'topic/fix/hda', ...
2008-10-26 Linus TorvaldsMerge branch 'for-linus' of git://neil.brown.name/md
2008-10-26 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-10-26 Linus TorvaldsMerge branch 'for-upstream' of git://git./linux/kernel...
2008-10-26 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-10-25 Len BrownMerge branch 'i7300_idle' into release
2008-10-24 Ingo MolnarMerge commit 'v2.6.28-rc1' into sched/urgent
2008-10-23 Linus TorvaldsMerge branch 'for-linus' of git://git.o-hand.com/linux...
2008-10-23 Linus TorvaldsMerge branch 'for-linus' of git://git.o-hand.com/linux...
2008-10-23 Linus TorvaldsMerge git://git./linux/kernel/git/jejb/scsi-misc-2.6
2008-10-23 Linus TorvaldsMerge git://git./linux/kernel/git/sfrench/cifs-2.6
2008-10-23 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-10-23 Linus TorvaldsMerge branch 'drm-next' of git://git./linux/kernel...
2008-10-23 Linus TorvaldsMerge branch 'for-2.6.28' of git://linux-nfs.org/~bfiel...
2008-10-23 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-10-23 Linus TorvaldsMerge branch 'core-fixes-for-linus' of git://git./linux...
2008-10-23 Linus TorvaldsMerge branch 'sched-fixes-for-linus' of git://git....
2008-10-23 Linus TorvaldsMerge git://git./linux/kernel/git/czankel/xtensa-2.6
2008-10-23 Linus TorvaldsMerge branch 'for-upstream' of git://git./linux/kernel...
2008-10-23 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-10-23 Linus TorvaldsMerge branch 'for-linus' of /home/rmk/linux-2.6-arm
2008-10-23 Linus TorvaldsMerge branch 'release' of git://git./linux/kernel/git...
2008-10-23 Haavard SkinnemoenMerge branches 'boards' and 'fixes' of git://git./linux...
2008-10-23 Len BrownMerge branch 'bugzilla-11715' into test
2008-10-23 Len BrownMerge branch 'linus' into test
2008-10-22 Russell KingMerge branch 'for-rmk' of git://git.android.com/kernel...
2008-10-22 Thomas GleixnerMerge branch 'timers/range-hrtimers' into v28-range...
2008-10-22 Ingo MolnarMerge branch 'tracing/ftrace' into tracing/urgent
2008-10-21 David WoodhouseMerge branch 'master' of /linux/kernel/git/torvalds...
2008-10-21 Benjamin HerrenschmidtMerge commit 'origin' into master
2008-10-20 Linus TorvaldsMerge git://git./linux/kernel/git/kyle/parisc-2.6
2008-10-20 Linus TorvaldsMerge branch 'bkl-removal' of git://git.lwn.net/linux-2.6
2008-10-20 Linus TorvaldsMerge branch 'linux-next' of git://git./linux/kernel...
2008-10-20 Linus TorvaldsMerge branch 'tracing-v28-for-linus' of git://git....
2008-10-20 Linus TorvaldsMerge branch 'x86-fixes-for-linus' of git://git./linux...
2008-10-20 Linus TorvaldsMerge branch 'genirq-v28-for-linus' of git://git./linux...
2008-10-16 Yinghai Ludrivers/net: use nr_irqs
2008-09-05 Ingo MolnarMerge commit '63cc8c75156462d4b42cbdd76c293b7eee7ddbfe':
2008-07-29 Anton VorontsovMerge branch 'master' of /home/cbou/linux-2.6
2008-07-27 Ingo MolnarMerge branch 'timers/urgent' of ssh:///linux/kernel...
2008-07-21 Linus TorvaldsMerge branch 'next' of git://git./linux/kernel/git...
2008-07-21 Dmitry TorokhovMerge /linux/kernel/git/torvalds/linux-2.6 into next
2008-07-15 Linus TorvaldsMerge branch 'for-linus' of git://git./linux/kernel...
2008-07-15 Linus TorvaldsMerge branch 'core/stacktrace' of git://git./linux...
2008-07-14 Russell King[ARM] Merge most of the PXA work for initial merge
2008-07-14 Jonathan CorbetMerge commit 'v2.6.26' into bkl-removal
2008-07-14 Thomas GleixnerMerge commit '900cfa46191a7d87cf1891924cb90499287fd235...
2008-07-14 Ingo MolnarMerge commit 'v2.6.26' into core/locking
2008-07-12 Russell KingMerge branch 'pxa-devel' into pxa
2008-07-12 Russell KingMerge branch 'eseries' into pxa
2008-07-12 Russell KingMerge branch 'pxa-tosa' into pxa
2008-07-12 Russell KingMerge branches 'pxa-ian' and 'pxa-xm270' into pxa
2008-07-11 David WoodhouseMerge branch 'master' of git://git./linux/kernel/git...
2008-07-10 Russell KingMerge branches 'pxa-ezx', 'pxa-magician' and 'pxa-palm...
2008-07-10 Russell KingMerge branches 'at91', 'dyntick', 'ep93xx', 'iop',...
next