Merge branch 'master-vanilla-configs' into linux-next
authorMichal Marek <mmarek@suse.cz>
Thu, 13 Dec 2012 09:38:49 +0000 (10:38 +0100)
committerMichal Marek <mmarek@suse.cz>
Thu, 13 Dec 2012 09:38:49 +0000 (10:38 +0100)
commite7308681e70ea033524aee6f06eee0083fda1f45
treed58f129073718d3650860777fc404f2a40a3d804
parent3cbf8f74edd575886049de763d8527c32c172d5f
parent63b6c488f1f105f5ca8317eb15838f0dbada0e01
Merge branch 'master-vanilla-configs' into linux-next

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