android_kernel_xiaomi_sm8350/arch
James Morris ec98ce480a Merge branch 'master' into next
Conflicts:
	fs/nfsd/nfs4recover.c

Manually fixed above to use new creds API functions, e.g.
nfs4_save_creds().

Signed-off-by: James Morris <jmorris@namei.org>
2008-12-04 17:16:36 +11:00
..
alpha Merge branch 'master' into next 2008-12-04 17:16:36 +11:00
arm spi: fix spi_s3c24xx_gpio num_chipselect 2008-12-01 19:55:24 -08:00
avr32 Merge branches 'boards' and 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6 2008-10-23 15:24:10 +02:00
blackfin Blackfin arch: fix a broken define in dma-mapping 2008-11-18 17:48:22 +08:00
cris [CRIS] Remove links from CRIS build 2008-10-31 23:37:57 +01:00
frv frv: fix mmap2 error handling 2008-12-01 19:55:24 -08:00
h8300 Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/dvrabel/uwb 2008-10-23 08:20:34 -07:00
ia64 Merge branch 'master' into next 2008-12-04 17:16:36 +11:00
m32r m32r: section noise in head.S 2008-11-30 10:03:37 -08:00
m68k m68k: Update defconfigs for 2.6.28-rc7 2008-12-02 20:58:26 +01:00
m68knommu
mips Merge branch 'master' into next 2008-12-04 17:16:36 +11:00
mn10300 MN10300: Fix application of kernel module relocations 2008-12-02 15:52:07 -08:00
parisc Merge branch 'master' into next 2008-12-04 17:16:36 +11:00
powerpc Merge branch 'master' into next 2008-12-04 17:16:36 +11:00
s390 Merge branch 'master' into next 2008-12-04 17:16:36 +11:00
sh serial: sh-sci: Reorder the SCxTDR write after the TDxE clear. 2008-11-13 17:46:06 +09:00
sparc remove __ARCH_WANT_COMPAT_SYS_PTRACE 2008-11-30 11:00:15 -08:00
sparc64 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6 2008-12-02 15:55:43 -08:00
um CRED: Pass credentials through dentry_open() 2008-11-14 10:39:22 +11:00
x86 Merge branch 'master' into next 2008-12-04 17:16:36 +11:00
xtensa Merge git://git.kernel.org/pub/scm/linux/kernel/git/czankel/xtensa-2.6 2008-10-23 09:16:56 -07:00
.gitignore
Kconfig remove __ARCH_WANT_COMPAT_SYS_PTRACE 2008-11-30 11:00:15 -08:00