Merge branch 'master-vanilla-configs' into linux-next
authorMichal Marek <mmarek@suse.cz>
Fri, 4 Jan 2013 11:16:28 +0000 (12:16 +0100)
committerMichal Marek <mmarek@suse.cz>
Fri, 4 Jan 2013 11:16:28 +0000 (12:16 +0100)
commit4463077c005fdff9b2ed90a5a90480cd7c0e5eff
treefacc9fa8fc7038502bbd7ee55946a6395fd83026
parente584d62b9d9c5fe07538bb52520776a6e8d0aecd
parent75de63886c5c613f6de58526911066598281708b
Merge branch 'master-vanilla-configs' into linux-next

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