diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-18 11:49:39 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-18 11:49:39 -0700 |
| commit | d63e210ef1546c2e0a725ba804cae5bc38731ad7 (patch) | |
| tree | 5c2328e0561e5a3043b9c5bcfd49d12ae1e61c93 /fs/xattr.c | |
| parent | a0a6a39ecb11cefe0d7e6e07997306fb5ab2b07e (diff) | |
| parent | 0cc40dac8605b3b6b099b47cdde9500d592e6583 (diff) | |
| download | linux-d63e210ef1546c2e0a725ba804cae5bc38731ad7.tar.bz2 | |
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
Pull MIPS fixes from Ralf Baechle:
"Random small fixes across the MIPS code."
* 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus:
MIPS: CMP: Fix physical core number calculation logic
MIPS: JZ4740: Forward declare struct uart_port in header.
MIPS: JZ4740: Fix '#include guard' in serial.h
MIPS: hugetlbfs: Fix hazard between tlb write and pagemask restoration.
MIPS: Restore pagemask after dumping the TLB.
MIPS: Hugetlbfs: Handle huge pages correctly in pmd_bad()
MIPS: R5000: Fix TLB hazard handling.
MIPS: tlbex: Deal with re-definition of label
MIPS: Make __{,n,u}delay declarations match definitions and generic delay.h
Diffstat (limited to 'fs/xattr.c')
0 files changed, 0 insertions, 0 deletions