From: Linus Torvalds <torvalds@linux-foundation.org> Date: Sat, 13 Oct 2012 20:26:39 +0000 (-0700) Subject: Merge tag 'disintegrate-spi-20121009' of git://git.infradead.org/users/dhowells/linux... X-Git-Tag: firefly_0821_release~3680^2~1811 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=034b5eeb6bc783e7f60e11299154556e65699e7a;p=firefly-linux-kernel-4.4.55.git Merge tag 'disintegrate-spi-20121009' of git://git.infradead.org/users/dhowells/linux-headers Pull spi UAPI disintegration from David Howells: "This is to complete part of the Userspace API (UAPI) disintegration for which the preparatory patches were pulled recently. After these patches, userspace headers will be segregated into: include/uapi/linux/.../foo.h for the userspace interface stuff, and: include/linux/.../foo.h for the strictly kernel internal stuff. Signed-off-by: David Howells <dhowells@redhat.com> Acked-by: Grant Likely <grant.likely@secretlab.ca>" * tag 'disintegrate-spi-20121009' of git://git.infradead.org/users/dhowells/linux-headers: UAPI: (Scripted) Disintegrate include/linux/spi --- 034b5eeb6bc783e7f60e11299154556e65699e7a