git.maquefel.me Git - linux.git/commit

projects / linux.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 24b3aa0 319e2e3)

author	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
	Tue, 17 Dec 2013 01:12:04 +0000 (17:12 -0800)
committer	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
	Tue, 17 Dec 2013 01:12:04 +0000 (17:12 -0800)
commit	5c5bccb76cb94888f40ebd5584b81646632e9c3f
tree	ee949fa6cc1dbe2632154b38ef6dd28f6185d218	tree \| snapshot
parent	24b3aa09970304ece816e73c3d7174d0dd315b98	commit \| diff
parent	319e2e3f63c348a9b66db4667efa73178e18b17d	commit \| diff

Merge 3.13-rc4 into staging-next.

We want the fixes in here as well.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Documentation/devicetree/bindings/vendor-prefixes.txt	diff1 \|	diff2 \|	blob \| history
include/linux/hid-sensor-ids.h	diff1 \|	diff2 \|	blob \| history

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