summaryrefslogtreecommitdiffstats
path: root/drivers/tc
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2008-09-16 23:11:43 +0200
committerDavid S. Miller <davem@davemloft.net>2008-09-16 23:11:43 +0200
commit2e57572a50a4de41c6cbc879a4866a312d4cd316 (patch)
treec4f58ec96c06642c4b415b881d3f0a3b673d5b44 /drivers/tc
parentsparc32: Use PROM device probing for sun4m timer registers. (diff)
parentsparc64: Fix OOPS in psycho_pcierr_intr_other(). (diff)
downloadlinux-2e57572a50a4de41c6cbc879a4866a312d4cd316.tar.xz
linux-2e57572a50a4de41c6cbc879a4866a312d4cd316.zip
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
Conflicts: arch/sparc64/kernel/pci_psycho.c
Diffstat (limited to 'drivers/tc')
0 files changed, 0 insertions, 0 deletions