Merge branch 'pxa-trizeps' into pxa-machines

Conflicts:

	drivers/pcmcia/Makefile
This commit is contained in:
Russell King 2008-10-07 19:06:52 +01:00 committed by Russell King
commit 5ff7f78a3d
10 changed files with 680 additions and 383 deletions