Merge branch 'master-vanilla-configs' into linux-next
authorMichal Marek <mmarek@suse.cz>
Fri, 29 Nov 2013 12:13:50 +0000 (13:13 +0100)
committerMichal Marek <mmarek@suse.cz>
Fri, 29 Nov 2013 12:13:50 +0000 (13:13 +0100)
commit88bb55d2875dd5928326d2acf91d62e2698e159a
treef99aa54f032220d38eedb0d571eb977be0a0b83e
parentd45ec7b59fb3986061d600c1e52c11e69a58414d
parent06e7f535d436249cfdae2843c6b05d1ae58e9e6f
Merge branch 'master-vanilla-configs' into linux-next

Conflicts:
config/x86_64/vanilla
config/i386/vanilla
config/x86_64/vanilla