summaryrefslogtreecommitdiffstats
path: root/arch/sparc/kernel/pci_common.c
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2010-08-20 20:52:23 +0900
committerPaul Mundt <lethal@linux-sh.org>2010-08-20 20:52:23 +0900
commitb9afa3e015273a52718e0a7efe198a0df76be880 (patch)
tree88cf67276533fcd5622d4cc2165ba889a98bb0db /arch/sparc/kernel/pci_common.c
parent144c7494239f12d554806439a17ad8203c7b2d3a (diff)
parent763008c4357b73c8d18396dfd8d79dc58fa3f99d (diff)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts: arch/sh/kernel/process_32.c Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sparc/kernel/pci_common.c')
0 files changed, 0 insertions, 0 deletions