projects / platform / upstream / kernel-adaptation-pc.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: d3072e6 01a678c)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-linus
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 16 Jan 2011 20:11:13 +0000 (12:11 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 16 Jan 2011 20:11:13 +0000 (12:11 -0800)
commit5520ebd308927a3beba599a2b68fa8c52f41f43b
treeb0395c15af7d096e6e6172a9d47bb7a8dec6add0tree | snapshot
parentd3072e6a7e9bf7aca200370317f8e297be360b17commit | diff
parent01a678c5a2f41663b8faf03d17e2bbdbf44158a9commit | diff
Merge git://git./linux/kernel/git/pkl/squashfs-linus

* git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-linus:
  Squashfs: simplify CONFIG_SQUASHFS_LZO handling
  Squashfs: move squashfs_i() definition from squashfs.h
  Squashfs: get rid of default n in Kconfig
  Squashfs: add missing check in zlib_wrapper
  Squashfs: remove unnecessary variable in zlib_wrapper
  Squashfs: Add XZ compression configuration option
  Squashfs: add XZ compression support
Domain: System / Uncategorized;