linux/arch
Linus Torvalds 5af568cbd5 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6:
  isofs: Fix lseek() to position beyond 4 GB
  vfs: remove unused MNT_STRICTATIME
  vfs: show unreachable paths in getcwd and proc
  vfs: only add " (deleted)" where necessary
  vfs: add prepend_path() helper
  vfs: __d_path: dont prepend the name of the root dentry
  ia64: perfmon: add d_dname method
  vfs: add helpers to get root and pwd
  cachefiles: use path_get instead of lone dget
  fs/sysv/super.c: add support for non-PDP11 v7 filesystems
  V7: Adjust sanity checks for some volumes
  Add v7 alias
  v9fs: fixup for inode_setattr being removed

Manual merge to take Al's version of the fs/sysv/super.c file: it merged
cleanly, but Al had removed an unnecessary header include, so his side
was better.
2010-08-11 09:23:32 -07:00
..
alpha dma-mapping: remove dma_is_consistent API 2010-08-11 08:59:21 -07:00
arm Merge branch 'ixp4xx' of git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux-2.6 2010-08-11 09:17:27 -07:00
avr32 dma-mapping: remove dma_is_consistent API 2010-08-11 08:59:21 -07:00
blackfin dma-mapping: remove dma_is_consistent API 2010-08-11 08:59:21 -07:00
cris dma-mapping: remove dma_is_consistent API 2010-08-11 08:59:21 -07:00
frv dma-mapping: remove dma_is_consistent API 2010-08-11 08:59:21 -07:00
h8300 Merge branch 'for-2.6.36' of git://git.kernel.dk/linux-2.6-block 2010-08-10 15:22:42 -07:00
ia64 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6 2010-08-11 09:23:32 -07:00
m32r Merge branch 'for-2.6.36' of git://git.kernel.dk/linux-2.6-block 2010-08-10 15:22:42 -07:00
m68k dma-mapping: remove dma_is_consistent API 2010-08-11 08:59:21 -07:00
m68knommu time: Kill off CONFIG_GENERIC_TIME 2010-07-27 12:40:54 +02:00
microblaze dma-mapping: remove dma_is_consistent API 2010-08-11 08:59:21 -07:00
mips dma-mapping: remove dma_is_consistent API 2010-08-11 08:59:21 -07:00
mn10300 dma-mapping: remove dma_is_consistent API 2010-08-11 08:59:21 -07:00
parisc dma-mapping: remove dma_is_consistent API 2010-08-11 08:59:21 -07:00
powerpc dma-mapping: remove dma_is_consistent API 2010-08-11 08:59:21 -07:00
s390 Merge branch 'for-2.6.36' of git://git.kernel.dk/linux-2.6-block 2010-08-10 15:22:42 -07:00
score Merge branch 'for-2.6.36' of git://git.kernel.dk/linux-2.6-block 2010-08-10 15:22:42 -07:00
sh Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm 2010-08-11 09:13:19 -07:00
sparc dma-mapping: remove dma_is_consistent API 2010-08-11 08:59:21 -07:00
tile dma-mapping: remove dma_is_consistent API 2010-08-11 08:59:21 -07:00
um dma-mapping: remove dma_is_consistent API 2010-08-11 08:59:21 -07:00
x86 dma-mapping: remove dma_is_consistent API 2010-08-11 08:59:21 -07:00
xtensa dma-mapping: remove dma_is_consistent API 2010-08-11 08:59:21 -07:00
.gitignore
Kconfig Merge branch 'perf/nmi' into perf/core 2010-08-05 08:45:05 +02:00