Please pull merge branch of pasemi.git

[Olof Johansson]

Paul,

Please pull from 'merge' branch of

  master.kernel.org:/pub/scm/linux/kernel/git/olof/pasemi.git merge

to receive the following updates for 2.6.26:

 arch/powerpc/configs/pasemi_defconfig |  172 +++++++++++++++++++++-------------
 drivers/pcmcia/electra_cf.c           |    1 
 2 files changed, 112 insertions(+), 61 deletions(-)

Olof Johansson (2):
      electra_cf: Add MODULE_DEVICE_TABLE()
      [POWERPC] pasemi: update pasemi_defconfig, enable electra_cf