summaryrefslogtreecommitdiffstats
path: root/arch/m68k/sun3
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2009-12-08 10:02:12 +0900
committerTejun Heo <tj@kernel.org>2009-12-08 10:02:12 +0900
commit50de1a8ef18da0cfff97543315b4e042e8bb7c83 (patch)
tree86056d1aef0e83d7839a8350c9e6109b80b3cfa5 /arch/m68k/sun3
parent390dfd95c5df1ab3921dd388d11b2aee332c3f2c (diff)
parentee0a6efc1897ef817e177e669f5c5d211194df24 (diff)
downloadop-kernel-dev-50de1a8ef18da0cfff97543315b4e042e8bb7c83.zip
op-kernel-dev-50de1a8ef18da0cfff97543315b4e042e8bb7c83.tar.gz
Merge branch 'for-linus' into for-next
Conflicts: mm/percpu.c
Diffstat (limited to 'arch/m68k/sun3')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud