Merge branch 'master-vanilla-configs' into linux-next
authorMichal Marek <mmarek@suse.cz>
Wed, 22 Aug 2012 13:06:53 +0000 (15:06 +0200)
committerMichal Marek <mmarek@suse.cz>
Wed, 22 Aug 2012 13:06:53 +0000 (15:06 +0200)
commitf92a4b6d1567bf035bcf093f0e2ae250f9e9bafb
tree4152839c19d71e1a85f877d22ee66af6e0b996a6
parenta91a01f5437e9ca316d9d1624b5af35fd4e22b15
parent88d289a06f8ef8bc31d8bcef1ee6dabf675d064d
Merge branch 'master-vanilla-configs' into linux-next

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