diff options
author | Linus Torvalds | 2010-06-11 23:19:45 +0200 |
---|---|---|
committer | Linus Torvalds | 2010-06-11 23:19:45 +0200 |
commit | 7ae1277a5202109a31d8f81ac99d4a53278dab84 (patch) | |
tree | b32748f82150e4a37b2416ffc2d844cc7d9e7ee5 /net/8021q/vlan_core.c | |
parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mas... (diff) | |
parent | PM / x86: Save/restore MISC_ENABLE register (diff) | |
download | kernel-qcow2-linux-7ae1277a5202109a31d8f81ac99d4a53278dab84.tar.gz kernel-qcow2-linux-7ae1277a5202109a31d8f81ac99d4a53278dab84.tar.xz kernel-qcow2-linux-7ae1277a5202109a31d8f81ac99d4a53278dab84.zip |
Merge branch 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6
* 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6:
PM / x86: Save/restore MISC_ENABLE register
Diffstat (limited to 'net/8021q/vlan_core.c')
0 files changed, 0 insertions, 0 deletions