Merge branch 'master-vanilla-configs' into linux-next
authorMichal Marek <mmarek@suse.cz>
Thu, 13 Sep 2012 09:18:03 +0000 (11:18 +0200)
committerMichal Marek <mmarek@suse.cz>
Thu, 13 Sep 2012 09:18:03 +0000 (11:18 +0200)
commit320d0ef2b54f0de1ae937cc9ab1271e6184e2443
treecaa50fe145af49d6023ea4a15853dee66dc2b76c
parent722b617382816f8e231073c3951e33207206d8df
parent83d5ac408b86c4746b4231fbe2515c91b8b27c3b
Merge branch 'master-vanilla-configs' into linux-next

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