diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-18 13:21:43 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-18 13:21:43 -0700 |
commit | 7103dbed8e462f2a065381d23fde086cbd5b9891 (patch) | |
tree | 5ac7ca3994c08a9dd3368daa0df205aee1a3c063 /scripts/selinux/README | |
parent | Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block (diff) | |
parent | MIPS: Kludge IP27 build for 2.6.39. (diff) | |
download | linux-dev-7103dbed8e462f2a065381d23fde086cbd5b9891.tar.xz linux-dev-7103dbed8e462f2a065381d23fde086cbd5b9891.zip |
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.
Diffstat (limited to 'scripts/selinux/README')
0 files changed, 0 insertions, 0 deletions