Merge commit 'origin/master' into pipes
commit35653a0ea2a07841cb7942da84a90d5398ff57d7
authorMartin 'povik' Poviser <martin.povik@gmail.com>
Wed, 10 Jun 2009 21:51:47 +0000 (10 23:51 +0200)
committerMartin 'povik' Poviser <martin.povik@gmail.com>
Wed, 10 Jun 2009 21:51:47 +0000 (10 23:51 +0200)
tree74bc69ee8cac3fa0f1cc47bab00fee6985dd9891
parent8809ae68721a3f2ea670cdfe6f0e2f209741d2da
parentf4bba72ccaccda44a8a087e75075ffb5fec681e4
Merge commit 'origin/master' into pipes

Conflicts:
kernel/defconfig
kernel/include/system.h