Merge branch 'misc' into for-next
authorMichal Marek <mmarek@suse.cz>
Wed, 15 Dec 2010 22:50:40 +0000 (22:50 +0000)
committerMichal Marek <mmarek@suse.cz>
Wed, 15 Dec 2010 22:50:40 +0000 (22:50 +0000)

Trivial merge