summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* eCryptfs: move misleading function commentsLi Wang2012-01-261-4/+4
* Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tyh...Linus Torvalds2012-01-267-195/+155
|\
| * eCryptfs: Fix oops when printing debug info in extent crypto functionsTyler Hicks2012-01-251-40/+0
| * eCryptfs: Remove unused ecryptfs_read()Tyler Hicks2012-01-251-73/+0
| * eCryptfs: Check inode changes in setattrTyler Hicks2012-01-251-12/+36
| * eCryptfs: Make truncate path killableTyler Hicks2012-01-251-5/+14
| * eCryptfs: Infinite loop due to overflow in ecryptfs_write()Li Wang2012-01-251-2/+2
| * eCryptfs: Replace miscdev read/write magic numbersTyler Hicks2012-01-253-41/+55
| * eCryptfs: Report errors in writes to /dev/ecryptfsTyler Hicks2012-01-251-11/+13
| * eCryptfs: Sanitize write counts of /dev/ecryptfsTyler Hicks2012-01-251-18/+38
| * ecryptfs: Remove unnecessary variable initializationTim Gardner2012-01-251-2/+3
| * ecryptfs: Improve metadata read failure loggingTim Gardner2012-01-251-3/+6
| * MAINTAINERS: Update eCryptfs maintainer addressDustin Kirkland2012-01-251-1/+1
* | Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/...Linus Torvalds2012-01-2514-560/+334
|\ \
| | \
| | \
| | \
| | \
| *---. \ Merge branches 'atomicio-apei', 'hotplug', 'sony-nvs-nosave' and 'thermal-net...Len Brown2012-01-247-46/+129
| |\ \ \ \
| | | | * | thermal: Rename generate_netlink_eventJean Delvare2012-01-233-5/+5
| | | | |/
| | | * / ACPI / PM: Add Sony Vaio VPCCW29FX to nonvs blacklist.Lan Tianyu2012-01-211-0/+8
| | | |/
| | * | ACPI processor hotplug: Delay acpi_processor_start() call for hotplugged coresThomas Renninger2012-01-203-8/+67
| | * | ACPI processor hotplug: Split up acpi_processor_addThomas Renninger2012-01-201-38/+54
| | |/
| * | Use acpi_os_map_memory() instead of ioremap() in einj driverLuck, Tony2012-01-241-44/+38
| * | ACPI, APEI, EINJ, cleanup 0 vs NULL confusionDan Carpenter2012-01-241-3/+3
| * | ACPI, APEI, EINJ Allow empty Trigger Error Action TableNiklas Söderlund2012-01-241-1/+6
| * | ACPI: Remove ./drivers/acpi/atomicio.[ch]Myron Stowe2012-01-213-433/+0
| * | ACPI, APEI: Add RAM mapping support to ACPIMyron Stowe2012-01-211-2/+34
| * | ACPI, APEI: Add 64-bit read/write support for APEI on i386Myron Stowe2012-01-213-31/+124
| |/
* | Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/po...Linus Torvalds2012-01-2515-32/+63
|\ \
| * | powerpc: Fix build on some non-freescale platformsBenjamin Herrenschmidt2012-01-251-0/+2
| * | powerpc/powernv: Fix PCI resource handlingBenjamin Herrenschmidt2012-01-251-16/+27
| * | powerpc/crash: Fix build error without SMPChristian Kujau2012-01-241-1/+1
| * | powerpc/cpuidle: Make it a bool, not a tristateDeepthi Dharwar2012-01-241-1/+1
| * | Merge remote-tracking branch 'kumar/merge' into mergeBenjamin Herrenschmidt2012-01-2411-14/+32
| |\ \
| | * | powerpc/85xx: Add dr_mode property in USB nodesRamneek Mehresh2012-01-184-3/+8
| | * | powerpc/85xx: Enable USB2 controller node for P1020RDBRamneek Mehresh2012-01-181-7/+4
| | * | powerpc/85xx: Fix cmd12 bug and add the chip compatible for eSDHCJerry Huang2012-01-185-2/+16
| | * | arch/powerpc/sysdev/fsl_pci.c: add missing iounmapJulia Lawall2012-01-171-2/+3
| | * | powerpc: fix compile error with 85xx/p1022_ds.cMichael Neuling2012-01-171-0/+1
* | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netLinus Torvalds2012-01-25102-512/+904
|\ \ \ \
| * | | | rds: Make rds_sock_lock BH rather than IRQ safe.David S. Miller2012-01-241-12/+8
| * | | | netprio_cgroup.h: dont include module.h from other includesPaul Gortmaker2012-01-241-1/+0
| * | | | net: flow_dissector.c missing include linux/export.hJesper Dangaard Brouer2012-01-241-0/+1
| * | | | team: send only changed options/ports via netlinkJiri Pirko2012-01-242-46/+100
| * | | | net/hyperv: fix possible memory leak in do_set_multicast()Wei Yongjun2012-01-241-2/+3
| * | | | drivers/net: dsa/mv88e6xxx.c files need linux/module.hPaul Gortmaker2012-01-244-0/+4
| * | | | stmmac: added PCI identifiersAlessandro Rubini2012-01-241-3/+3
| * | | | llc: Fix race condition in llc_ui_recvmsgRadu Iliescu2012-01-241-0/+5
| * | | | stmmac: fix phy naming inconsistencyAlessandro Rubini2012-01-241-1/+1
| * | | | dsa: Add reporting of silicon revision for Marvell 88E6123/88E6161/88E6165 sw...Chris Healy2012-01-231-4/+17
| * | | | tg3: fix ipv6 header length computationEric Dumazet2012-01-231-7/+2
| * | | | skge: add byte queue limit supportstephen hemminger2012-01-231-13/+24
| * | | | mv643xx_eth: Add Rx Discard and Rx Overrun statisticsPaulius Zaleckas2012-01-231-0/+14