Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux...
authorFelix Blyakher <felixb@sgi.com>
Tue, 3 Feb 2009 16:38:41 +0000 (10:38 -0600)
committerFelix Blyakher <felixb@sgi.com>
Tue, 3 Feb 2009 16:38:41 +0000 (10:38 -0600)
commit6d2160bfe7826aca1c94b4bca77093908a452ae7
tree8153fcd8a7c467e5de136f312e8ef5b27bea9d6b
parentf0e0059b9c18426cffdcc04161062251a8f9741e
parentb1792e367053968f2ddb48bc911d314143ce6242
Merge branch 'master' of git://git./linux/kernel/git/torvalds/linux-2.6 into for-linus