Merge commit 'linus' into next
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Tue, 15 Dec 2009 16:49:32 +0000 (08:49 -0800)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Tue, 15 Dec 2009 16:49:32 +0000 (08:49 -0800)
commit7547a3e8a43d31aaf91c2daf5f597e43212ccddf
treeadd99b58ac3b490f6ede666b9dbf2333d87e24fa
parent0f5e182dff576e6f3cd9b805834f18d11f2882aa
parent3ea6b3d0e6d0ffd91c0f8cadeb69b7133c038b32
Merge commit 'linus' into next