| commit | 0143832cc96d0bf78486297aad5c8fb2c2ead02a | |
| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Sat, 13 Nov 2010 18:00:15 +0000 (13 10:00 -0800) | ||
| committer | Linus Torvalds <torvalds@linux-foundation.org> | |
| Sat, 13 Nov 2010 18:00:15 +0000 (13 10:00 -0800) | ||
| tree | 4aa5c06a58da4295a6053fb950e883fb33db82ae | treesnapshot (tar.gz zip) |
| parent | f8b372a11cc102b9a0dcc6ac2bd10f0b6b2755a9 | commitdiff |
| parent | 106665d937df6eff33c71997a52f7bc3aefa6c12 | commitdiff |
Merge branch 'urgent' of git://git./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
* '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