Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux... v2.6.25-rc8-zen0
commit5272ff6522682db77213e47ef9a4b203aa317ffc
authorDominic Duklas <dodo1122@googlemail.com>
Wed, 2 Apr 2008 12:25:27 +0000 (2 13:25 +0100)
committerDominic Duklas <dodo1122@googlemail.com>
Wed, 2 Apr 2008 12:25:27 +0000 (2 13:25 +0100)
treed1eced85613d93aced327ced4a71292a7b6d634b
parent45b8e7d2a9a7fd6c81c5df16dc7b75b04bc87082
parent0e81a8ae37687845f7cdfa2adce14ea6a5f1dd34
Merge branch 'master' of git://git./linux/kernel/git/torvalds/linux-2.6 into master-devel
Documentation/kernel-parameters.txt
Makefile
arch/mips/Makefile
arch/sh/Kconfig
mm/slub.c