diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-01-13 16:15:09 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-01-13 16:15:09 -0800 |
commit | 4f374425b625d48445e370f63c896283eb2a9bae (patch) | |
tree | 9f8641b37ebaf18accfdc179a5701e5f7271a8e1 /net | |
parent | Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 (diff) | |
parent | xen: fix hang on suspend. (diff) | |
download | linux-dev-4f374425b625d48445e370f63c896283eb2a9bae.tar.xz linux-dev-4f374425b625d48445e370f63c896283eb2a9bae.zip |
Merge branch 'for-linus/bugfixes' of git://xenbits.xensource.com/people/ianc/linux-2.6
* 'for-linus/bugfixes' of git://xenbits.xensource.com/people/ianc/linux-2.6:
xen: fix hang on suspend.
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions