Merge branch 'bkl' into for-linus
authorJiri Kosina <jkosina@suse.cz>
Wed, 4 Aug 2010 13:31:24 +0000 (15:31 +0200)
committerJiri Kosina <jkosina@suse.cz>
Wed, 4 Aug 2010 13:31:24 +0000 (15:31 +0200)
commit9f17d516416c88dfe18f4deee508fce763ddedb5
tree93609b4698a768b8c70720ceea30b8a03abd53b1
parentada8c7973b65865cf0436b73898e32992860012a
parentbd25f4dd6972755579d0ea50d1a5ace2e9b00d1a
Merge branch 'bkl' into for-linus