summaryrefslogtreecommitdiffstats
path: root/drivers/pcmcia
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-03-29 13:05:41 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-03-29 13:05:41 -0700
commit0d34fb8e93ceba7b6dad0062dbb4a0813bacd75b (patch)
treed32f847a50e9892be21126a43b6c781379a44441 /drivers/pcmcia
parent503e57630309643562c12f09d4c8a96eb629ee33 (diff)
parent40297927575a50b1d0d308d735c445924d33fba6 (diff)
downloadblackbird-op-linux-0d34fb8e93ceba7b6dad0062dbb4a0813bacd75b.tar.gz
blackbird-op-linux-0d34fb8e93ceba7b6dad0062dbb4a0813bacd75b.zip
Merge branch 'bzip2-lzma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-tip
* 'bzip2-lzma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-tip: bzip2/lzma: don't ask for compression mode for the default initramfs bzip2/lzma: consistently capitalize LZMA in Kconfig bzip2/lzma: clarify the meaning of the CONFIG_RD_ options bzip2/lzma: move CONFIG_RD_* options under CONFIG_EMBEDDED
Diffstat (limited to 'drivers/pcmcia')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud