summaryrefslogtreecommitdiffstats
path: root/arch/m32r/boot
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-02-11 17:21:29 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2009-02-11 17:21:29 +0100
commit93431dd7afa908292753acccb68785efaa366f5b (patch)
tree42a64d0150e289f936afe12da91f601625e6b8b1 /arch/m32r/boot
parentMerge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/po... (diff)
parent[S390] Update default configuration. (diff)
downloadlinux-93431dd7afa908292753acccb68785efaa366f5b.tar.xz
linux-93431dd7afa908292753acccb68785efaa366f5b.zip
Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6
* 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6: [S390] Update default configuration. [S390] dasd: fix race in dasd timer handling [S390] dasd: bus_id -> dev_name() conversion. [S390] Fix init irq proc build break. [S390] vdso: fix per cpu vdso pointer in lowcore
Diffstat (limited to 'arch/m32r/boot')
0 files changed, 0 insertions, 0 deletions