Merge branch 'master-vanilla-configs' into linux-next
authorMichal Marek <mmarek@suse.cz>
Mon, 23 Sep 2013 10:16:43 +0000 (12:16 +0200)
committerMichal Marek <mmarek@suse.cz>
Mon, 23 Sep 2013 10:16:43 +0000 (12:16 +0200)
commit52754055c4fd76da34a04533b617041236d18e27
tree787d6bfb8326e2321f9beeef0ecfdfbfd05ea3ae
parent9f04313ac04972b91140261b214f7bc31f873e6b
parent53326c8afe7d8462364bb0844bb8a3e6e237093f
Merge branch 'master-vanilla-configs' into linux-next

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