2008-03-27 23:08:24

by Paul Mackerras

[permalink] [raw]
Subject: Please pull powerpc.git merge branch

Linus,

Olof Johansson has a defconfig update for the pasemi platform that he
would like to have in 2.6.25, so please do:

git pull \
git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git merge

Thanks,
Paul.

arch/powerpc/configs/pasemi_defconfig | 142 ++++++++++++++++++++-------------
1 files changed, 88 insertions(+), 54 deletions(-)

commit 5c29934de29ddd7ecd913d83cad28e872f2e8c78
Author: Olof Johansson <[email protected]>
Date: Tue Mar 25 10:28:26 2008 -0500

[POWERPC] update pasemi_defconfig

Disable GEN_RTC since it conflicts with the i2c rtc drivers registering,
besides that keep most of the new defaults.

Signed-off-by: Olof Johansson <[email protected]>