projects / users / willy / xarray.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 064e38a a3cb900)
Merge branch 'upstream-linus2' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarz...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 6 Jun 2009 19:17:03 +0000 (12:17 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 6 Jun 2009 19:17:03 +0000 (12:17 -0700)
* 'upstream-linus2' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
  [libata] pata_ali: Use IGN_SIMPLEX


Trivial merge
XArray, radix tree and IDR