| commit | 7103dbed8e462f2a065381d23fde086cbd5b9891 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Wed May 18 13:21:43 2011 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Wed May 18 13:21:43 2011 -0700 |
| tree | 5ac7ca3994c08a9dd3368daa0df205aee1a3c063 | |
| parent | a2b9c1f6208126e6df6c02428c501f8853685812 [diff] | |
| parent | a5602a3273774c720aaf165ff670e5b85e5910a5 [diff] |
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linus * 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linus: MIPS: Kludge IP27 build for 2.6.39. MIPS: AR7: Fix GPIO register size for Titan variant. MIPS: Fix duplicate invocation of notify_die. MIPS: RB532: Fix iomap resource size miscalculation.