Merge master.kernel.org:/pub/scm/linux/kernel/git/aegl/linux-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Wed, 27 Jul 2005 23:37:03 +0000 (16:37 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Wed, 27 Jul 2005 23:37:03 +0000 (16:37 -0700)
commit96fad28a781069eb40156f78b8f50c349805b652
tree0d428a842ac643176921fcf44e1728ea6ff88690
parent3334c39f1815d2911238c43f40840c3c7b378165
parentb833961bd30eec201b9a94eec36aa7ac96f9c9c0
Merge /pub/scm/linux/kernel/git/aegl/linux-2.6