summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/po...Linus Torvalds2011-11-1228-65/+346
|\
| * powerpc/kvm: Fix build failure with HV KVM and CBEAlexander Graf2011-11-081-3/+3
| * Merge remote-tracking branch 'agust/next' into mergeBenjamin Herrenschmidt2011-11-083-8/+249
| |\
| | * powerpc, tqm5200: update tqm5200_defconfig to fit for charon board.Heiko Schocher2011-09-291-8/+12
| | * powerpc/5200: add support for charon boardHeiko Schocher2011-09-292-0/+237
| * | powerpc/ps3: Fix lv1_gpu_attribute hcallGeoff Levand2011-11-082-2/+2
| * | powerpc/ps3: Fix PS3 repository build warningsGeoff Levand2011-11-081-16/+16
| * | powerpc/ps3: irq: Remove IRQF_DISABLEDYong Zhang2011-11-082-2/+2
| * | powerpc/irq: Remove IRQF_DISABLEDYong Zhang2011-11-0814-26/+18
| * | powerpc/numa: NUMA topology support for PowerNVDipankar Sarma2011-11-081-7/+17
| * | powerpc: Add System RAM to /proc/iomemAnton Blanchard2011-11-081-0/+30
| * | powerpc: Add KVM as module to defconfigsMichael Neuling2011-11-082-0/+8
| * | powerpc/kvm: Fix build with older toolchainsNishanth Aravamudan2011-11-081-1/+1
* | | Merge branch 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmar...Linus Torvalds2011-11-122-3/+3
|\ \ \
| * | | kbuild: Fix missing system calls check on mips.David Daney2011-11-092-3/+3
| |/ /
* | | bma023: Add SFI translation for this deviceWilliam Douglas2011-11-121-0/+1
* | | vrtc: change its year offset from 1960 to 1972Feng Tang2011-11-122-10/+13
* | | ce4100: fix a build errorZhang Rui2011-11-121-1/+1
* | | Merge branch 'upstream-linus' of git://github.com/jgarzik/libata-devLinus Torvalds2011-11-128-10/+26
|\ \ \
| * | | pata_of_platform: Don't use NO_IRQAnton Vorontsov2011-11-101-1/+1
| * | | [libata] ahci: Add ASMedia ASM1061 supportKeng-Yu Lin2011-11-092-0/+5
| * | | [libata] Issue SRST to Sil3726 PMPGwendal Grignou2011-11-092-6/+13
| * | | sata_sis.c: trivial spelling fixChris Dunlop2011-11-091-1/+1
| * | | ahci_platform: use dev_get_platdata()JiSheng Zhang2011-11-091-2/+2
| * | | [libata] libata-scsi.c: Add function parameter documentationMarcos Paulo de Souza2011-11-091-0/+4
| |/ /
* | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mas...Linus Torvalds2011-11-1212-145/+262
|\ \ \
| * | | btrfs: rename the option to nospace_cacheDavid Sterba2011-11-111-2/+2
| * | | Btrfs: handle bio_add_page failure gracefully in scrubArne Jansen2011-11-111-35/+29
| * | | Btrfs: fix deadlock caused by the race between relocationMiao Xie2011-11-111-2/+2
| * | | Btrfs: only map pages if we know we need them when reading the space cacheJosef Bacik2011-11-111-7/+10
| * | | Btrfs: fix orphan backref nodesMiao Xie2011-11-111-0/+2
| * | | Btrfs: Abstract similar code for btrfs_block_rsv_add{, _noflush}Miao Xie2011-11-111-16/+12
| * | | Btrfs: fix unreleased path in btrfs_orphan_cleanup()Miao Xie2011-11-111-0/+3
| * | | Btrfs: fix no reserved space for writing out inode cacheMiao Xie2011-11-111-4/+24
| * | | Btrfs: fix nocow when deleting the itemMiao Xie2011-11-111-1/+4
| * | | Merge branch 'mount-fixes' of git://github.com/idryomov/btrfs-unstable into i...Chris Mason2011-11-112-46/+43
| |\ \ \
| | * | | Btrfs: rework error handling in btrfs_mount()Ilya Dryomov2011-11-091-21/+21
| | * | | Btrfs: close devices on all error paths in open_ctree()Ilya Dryomov2011-11-091-4/+3
| | * | | Btrfs: avoid null dereference and leaks when bailing from open_ctree()Ilya Dryomov2011-11-091-20/+15
| | * | | Btrfs: fix subvol_name leak on error in btrfs_mount()Ilya Dryomov2011-11-091-1/+3
| | * | | Btrfs: fix memory leak in btrfs_parse_early_options()Ilya Dryomov2011-11-091-0/+1
| * | | | Btrfs: tweak the delayed inode reservations againChris Mason2011-11-112-26/+47
| |/ / /
| * | | Btrfs: fix our reservations for updating an inode when completing ioJosef Bacik2011-11-084-9/+83
| * | | Btrfs: fix oops on NULL trans handle in btrfs_truncateChris Mason2011-11-081-7/+9
| * | | btrfs: fix double-free 'tree_root' in 'btrfs_mount()'slyich@gmail.com2011-11-071-3/+5
* | | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiw...Linus Torvalds2011-11-1214-119/+241
|\ \ \ \
| * \ \ \ Merge branch 'fix/misc' into for-linusTakashi Iwai2011-11-109-47/+123
| |\ \ \ \
| | * | | | ALSA: usb-audio: Use kmemdup rather than duplicating its implementationThomas Meyer2011-11-101-4/+3
| | * | | | ALSA: hda - Re-enable the check NO_PRESENCE misc bitTakashi Iwai2011-11-103-7/+14
| | * | | | ALSA: vmaster - Free slave-links when freeing the master elementTakashi Iwai2011-11-101-4/+14