summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-07-26 16:02:07 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-07-26 16:02:07 -0700
commit1a041a23da7c77b53c71fe11b4f940388bee37b1 (patch)
tree15be66d3768d609a477a99a0d59522133a831ee0 /net
parentee13cbdec4381b5bdb24683b5e7fcc29084c355d (diff)
parentff4878089e1eaeac79d57878ad4ea32910fb4037 (diff)
downloadop-kernel-dev-1a041a23da7c77b53c71fe11b4f940388bee37b1.zip
op-kernel-dev-1a041a23da7c77b53c71fe11b4f940388bee37b1.tar.gz
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86: Do not try to disable hpet if it hasn't been initialized before x86, i8259: Only register sysdev if we have a real 8259 PIC
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud