summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-07-21 09:31:15 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-07-21 09:31:15 -0700
commitcd5b8f8755a89a57fc8c408d284b8b613f090345 (patch)
tree815d171db7d102c78458103da9be4949fa31e816 /Makefile
parent052a1cdbfabf2d122ee4eb5ce34ae1e1d72ded09 (diff)
parent418c527873049a9b866aa02948931d7baad7094a (diff)
downloadlinux-cd5b8f8755a89a57fc8c408d284b8b613f090345.tar.bz2
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: pcmcia: fix 'driver ... did not release config properly' warning
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions