]> git.openfabrics.org - ~shefty/rdma-dev.git/commitdiff
Merge branch 'misc-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 7 Jan 2012 02:02:43 +0000 (18:02 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 7 Jan 2012 02:02:43 +0000 (18:02 -0800)
* 'misc-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux:
  ia64: pcibr: Use kmemdup rather than duplicating its implementation
  ia64: sn: Use kmemdup rather than duplicating its implementation
  ia64: tioca: Use kmemdup rather than duplicating its implementation
  [IA64] Merge overlapping reserved regions at boot


Trivial merge