tree 6eea09e0ca802da6c4236155b30e7a5c38c2b436
parent 7426ef52b42ebd54ba85133ffd29132e008a882c
parent 23d021167eebf0df5ccadf4f8de5ccb8d4ac2904
parent da54a0ced4502dc2a25df034f218463a2a50488d
parent f77e347bd44e3640bdc56003b7402c63ddb1241d
parent 6a740aa4f47b9f29bad5292cf51f008f3edad9b1
author Jiri Kosina <jkosina@suse.cz> 1274270706 +0200
committer Jiri Kosina <jkosina@suse.cz> 1274270706 +0200

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