summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2009-12-07 18:30:49 +0100
committerJiri Kosina <jkosina@suse.cz>2009-12-07 18:30:49 +0100
commit447753d97764b0ae3969936ec495e794baa88052 (patch)
tree4db7e848aab1891349b34bc173b6626ffc999f44 /include
parent6ec22f9b037fc0c2e00ddb7023fad279c365324d (diff)
parent6c857730438cceb56a94ade3029899f52adf3b90 (diff)
parent24985cf68612a5617d396b0b188cec807641cde1 (diff)
parent9db630b48a99adb4156e205b812fba8959644280 (diff)
Merge branches 'bkl-removal', 'upstream' and 'upstream-fixes' into for-linus