Merge branch 'master-vanilla-configs' into linux-next
authorMichal Marek <mmarek@suse.cz>
Mon, 18 Mar 2013 09:43:44 +0000 (10:43 +0100)
committerMichal Marek <mmarek@suse.cz>
Mon, 18 Mar 2013 09:43:44 +0000 (10:43 +0100)
commitd25d59ba0116693cb8576fcd6303d262e4fb3fb8
tree54d3e63bee4a75069d7dd1799ee380389a2dcda1
parentb2c51589e79effd41a73271ac5d84fbc97a08a8d
parentf10ab2fa885d67e87fa93758aa8e63616f84aa77
Merge branch 'master-vanilla-configs' into linux-next

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