aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-07-06 17:14:53 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-07-06 17:14:53 -0700
commit8b8ce8810b092cef35e15af6577ad569f6145c0a (patch)
tree4fe8af65c11578edb6b4ef9a9ef84aa4061dd2f6 /kernel
parentMerge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus (diff)
parentpcmcia: do not initialize the present flag too late. (diff)
downloadlinux-dev-8b8ce8810b092cef35e15af6577ad569f6145c0a.tar.xz
linux-dev-8b8ce8810b092cef35e15af6577ad569f6145c0a.zip
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: do not initialize the present flag too late.
Diffstat (limited to 'kernel')
0 files changed, 0 insertions, 0 deletions