Merge branch 'master-vanilla-configs' into linux-next
authorMichal Marek <mmarek@suse.cz>
Wed, 13 Nov 2013 11:27:20 +0000 (12:27 +0100)
committerMichal Marek <mmarek@suse.cz>
Wed, 13 Nov 2013 11:27:20 +0000 (12:27 +0100)
commit4957a5caa2a2ce311329754e1649b0c1ef288d8e
treec8d32774dcd031194181b83290ba8030fd058774
parentb2a122c86c9c6db32bd0add041ac391f50c63f93
parentf40d115a1969c4ef0bf23e05569134db71266de5
Merge branch 'master-vanilla-configs' into linux-next

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