tree 4db7e848aab1891349b34bc173b6626ffc999f44
parent 6ec22f9b037fc0c2e00ddb7023fad279c365324d
parent 6c857730438cceb56a94ade3029899f52adf3b90
parent 24985cf68612a5617d396b0b188cec807641cde1
parent 9db630b48a99adb4156e205b812fba8959644280
author Jiri Kosina <jkosina@suse.cz> 1260207049 +0100
committer Jiri Kosina <jkosina@suse.cz> 1260207049 +0100

Merge branches 'bkl-removal', 'upstream' and 'upstream-fixes' into for-linus