Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux...
authorBen Dooks <ben-linux@fluff.org>
Mon, 27 Oct 2008 12:32:29 +0000 (12:32 +0000)
committerBen Dooks <ben-linux@fluff.org>
Mon, 27 Oct 2008 12:32:29 +0000 (12:32 +0000)
commitb99053eefce89c5c8500517f5f065c85b57d98ee
tree2e99059d55e32db39a2ada348c39f71bb473c0c1
parent761e0ee0f0beecee7c2528588b043609b880de58
parentf8d56f1771e4867acc461146764b4feeb5245669
Merge branch 'master' of git://git./linux/kernel/git/torvalds/linux-2.6 into s3c64xx

Conflicts:
arch/arm/mm/Kconfig
arch/arm/Kconfig
arch/arm/Makefile
arch/arm/mm/Kconfig