]> git.apps.os.sepia.ceph.com Git - ceph-client.git/commit
projects / ceph-client.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 592311c 1ff42c3)
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 29 Apr 2011 22:07:19 +0000 (15:07 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 29 Apr 2011 22:07:19 +0000 (15:07 -0700)
commita6ab948e6500306dcb415ec80bff5f9b93f41b90
tree7c5d934ae840835b63dd38dbeb47adfc40927648tree | snapshot
parent592311c91daece7d6503bdef8fcc434f829aad23commit | diff
parent1ff42c32c7614c2e810ed388fd1ba04a5626b74ccommit | diff
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: ce4100: Configure IOAPIC pins for USB and SATA to level type
  x86: devicetree: Configure IOAPIC pin only once
  x86, setup: When probing memory with e801, use ax/bx as a pair
Unnamed repository; edit this file 'description' to name the repository.