02b9a0dcc6ac2bd10f0b6b2755a9
parent 106665d937df6eff33c71997a52f7bc3aefa6c12
author Linus Torvalds <torvalds@linux-foundation.org> 1289671215 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1289671215 -0800

Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6

* 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6:
  drivers/pcmcia/soc_common.c: Use printf extension %pV
  pcmcia: fix warning in synclink driver
  pcmcia/sa1100: don't put machine specific init functions in .init.text
  pcmcia/cm4000: fix error code
  pd6729: Coding Style fixes
aWâÃ’'x