projects / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (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)
* 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


Trivial merge
ep93xx device tree rework repo: git://git.maquefel.me/linux.git