Merge branch 'master' into for-next
authorJiri Kosina <jkosina@suse.cz>
Sat, 30 Oct 2010 20:16:56 +0000 (22:16 +0200)
committerJiri Kosina <jkosina@suse.cz>
Sat, 30 Oct 2010 20:16:56 +0000 (22:16 +0200)
commitf1e095f1d206b81b44160f41278ce5c78641e9b7
treebd293d46d2d3e4cdf435a22ddb2877c6ba1b8acc
parentb0438a1b71955c425c304a2a483765ef24841766
parent1792f17b7210280a3d7ff29da9614ba779cfcedb
Merge branch 'master' into for-next