tree 517290fd884d286fe2971137ac89f89e3567785a
parent 160bbab3000dafccbe43688e48208cecf4deb879
parent fe0bdec68b77020281dc814805edfe594ae89e0f
author David Woodhouse <David.Woodhouse@intel.com> 1231149033 +0100
committer David Woodhouse <David.Woodhouse@intel.com> 1231149033 +0100

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:
	arch/arm/mach-pxa/corgi.c
	arch/arm/mach-pxa/poodle.c
	arch/arm/mach-pxa/spitz.c