Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm
[powerpc.git] / arch / arm / mach-pxa / sharpsl_pm.c
2005-11-10 Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-arm
2005-11-10 Richard Purdie[ARM] 3096/1: Add SharpSL Zaurus power and battery...