From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 13 Nov 2010 18:00:15 +0000 (-0800)
Subject: Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6
X-Git-Tag: v2.6.37-rc2~14
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=0143832cc96d0bf78486297aad5c8fb2c2ead02a;p=users%2Fjedix%2Flinux-maple.git

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
---

0143832cc96d0bf78486297aad5c8fb2c2ead02a