summaryrefslogtreecommitdiffstats
path: root/fs/ecryptfs/inode.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-04-24 17:45:37 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2011-04-24 17:45:37 +0200
commit8f7544682c488dfc4117b37ed10435bb2d3d8d73 (patch)
tree075f7404d81e3ff8f8cfa52f09a618e9a13b0a55 /fs/ecryptfs/inode.c
parentMerge branch 'for-linus' of git://git.infradead.org/ubifs-2.6 (diff)
parentlibata: ahci_start_engine compliant to AHCI spec (diff)
downloadlinux-8f7544682c488dfc4117b37ed10435bb2d3d8d73.tar.xz
linux-8f7544682c488dfc4117b37ed10435bb2d3d8d73.zip
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev
* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev: libata: ahci_start_engine compliant to AHCI spec ata: pata_at91.c bugfix for initial_timing initialisation ata: pata_at91.c bugfix for high master clock ahci: AHCI-mode SATA patch for Intel Panther Point DeviceIDs ata_piix: IDE-mode SATA patch for Intel Panther Point DeviceIDs libata: Pioneer DVR-216D can't do SETXFER ahci: don't enable port irq before handler is registered libata: Implement ATA_FLAG_NO_DIPM and apply it to mcp65 libata: Kill unused ATA_DFLAG_{H|D}IPM flags ahci: EM supported message type sysfs attribute
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions