commit | bf0cbb3e4264e9d6493af757f63d4b0527d21eab | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@g5.osdl.org> | Mon Sep 26 18:31:36 2005 -0700 |
committer | Linus Torvalds <torvalds@g5.osdl.org> | Mon Sep 26 18:31:36 2005 -0700 |
tree | 61903263aa73f98d0d6d7fbc77013080b0eb8856 | |
parent | 0b1556945475e8529328edf98ff0d201ed133edb [diff] | |
parent | 4fb7edce52e5b6cf41e3375822d74a27f0b6f2dd [diff] |
Merge master.kernel.org:/pub/scm/linux/kernel/git/brodo/pcmcia-fixes-2.6