Merge branch 'master-vanilla-configs' into linux-next
authorMichal Marek <mmarek@suse.cz>
Tue, 12 Feb 2013 09:54:44 +0000 (10:54 +0100)
committerMichal Marek <mmarek@suse.cz>
Tue, 12 Feb 2013 09:54:44 +0000 (10:54 +0100)
commit4a6428f44a5abdbbebc7e5949e0a322d8047941d
tree08aa6511b8c82fc6683a4298e7169c0865cb5c74
parent1f694ec3e5e1422f89a35ea1540587a6bfa020d4
parent844f33de6b85517305dfd6b4bf90a37d7187f016
Merge branch 'master-vanilla-configs' into linux-next

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