summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'for-linus' of git://git.code.sf.net/p/openipmi/linux-ipmiLinus Torvalds2014-12-129-515/+2828
|\
| * ipmi: Check the BT interrupt enable periodicallyCorey Minyard2014-12-111-2/+25
| * ipmi: Fix attention handling for system interfacesCorey Minyard2014-12-111-15/+30
| * ipmi: Periodically check to see if irqs and messages are set rightCorey Minyard2014-12-111-96/+101
| * drivers/char/ipmi: Add powernv IPMI driverJeremy Kerr2014-12-113-0/+317
| * ipmi: Add SMBus interface driver (SSIF)Corey Minyard2014-12-114-3/+1950
| * ipmi: Remove the now unused priority from SMI senderCorey Minyard2014-12-113-9/+7
| * ipmi: Remove the now unnecessary message queueCorey Minyard2014-12-111-78/+34
| * ipmi: Make the message handler easier to use for SMI interfacesCorey Minyard2014-12-111-40/+162
| * ipmi: Move message sending into its own functionCorey Minyard2014-12-111-4/+9
| * ipmi: rename waiting_msgs to waiting_rcv_msgsCorey Minyard2014-12-111-15/+16
| * ipmi: Fix handling of BMC flagsCorey Minyard2014-12-111-37/+68
| * ipmi: Initialize BMC device attributesCorey Minyard2014-12-111-0/+2
| * ipmi: Unregister previously registered driver in error casetrenn@suse.de2014-12-111-0/+1
| * ipmi: Use the proper type for acpi_handleCorey Minyard2014-12-111-1/+4
| * ipmi: Fix a bug in hot add/removeCorey Minyard2014-12-111-1/+1
| * ipmi: Remove useless sysfs_name parametersCorey Minyard2014-12-113-31/+5
| * ipmi: clean up the device handling for the bmc deviceCorey Minyard2014-12-111-193/+92
| * ipmi: Move the address source to string to ipmi-generic codeCorey Minyard2014-12-113-7/+16
| * ipmi: Ignore SSIF in the PNP handlingCorey Minyard2014-12-111-0/+5
| * Merge branch 'topic/opal-ipmi' of git://git.kernel.org/pub/scm/linux/kernel/g...Corey Minyard2014-12-113-0/+33
| |\
* | \ Merge tag 'docs-for-linus' of git://git.lwn.net/linux-2.6Linus Torvalds2014-12-1217-73/+202
|\ \ \
| * | | kobject: grammar fixJohn de la Garza2014-12-081-1/+1
| * | | Input: xpad - update docs to reflect current stateDaniel Dressler2014-12-051-40/+83
| * | | Documentation: Build mic/mpssd only for x86_64Ashutosh Dixit2014-12-051-1/+1
| * | | cgroups: Documentation: fix wrong cgroupfs pathsSeongJae Park2014-12-031-2/+2
| * | | Documentation/email-clients.txt: add info about Claws MailRichard Leitner2014-12-021-0/+11
| * | | CodingStyle: add some more error handling guidelinesDan Carpenter2014-12-021-5/+22
| * | | Merge branch 'docs-3.19' into docs-nextJonathan Corbet2014-11-242-11/+62
| |\ \ \
| | * | | kselftest: Move the docs to the Documentation dirTim Bird2014-11-241-11/+19
| | * | | CodingStyle: Add a chapter on conditional compilationJosh Triplett2014-11-031-0/+43
| * | | | Documentation: fix formatting to make 's' happyMaisa Roponen2014-11-241-1/+1
| * | | | Documentation: power: Fix typo in Documentation/powerMasanari Iida2014-11-083-5/+5
| * | | | Documentation: vm: Add 1GB large page support informationMasanari Iida2014-11-061-2/+2
| * | | | ipv4: add kernel parameter tcpmhash_entriesFabian Frederick2014-11-061-0/+7
| * | | | Documentation: Fix a typo in mailbox.txtMasanari Iida2014-11-031-1/+1
| * | | | treewide: Fix typo in Documentation/DocBook/device-driversMasanari Iida2014-11-033-4/+4
| |/ / /
* | | | Merge tag 'please-pull-morepstore' of git://git.kernel.org/pub/scm/linux/kern...Linus Torvalds2014-12-124-14/+47
|\ \ \ \
| * | | | pstore-ram: Allow optional mapping with pgprot_noncachedTony Lindgren2014-12-114-14/+47
| * | | | pstore-ram: Fix hangs by using write-combine mappingsRob Herring2014-12-111-2/+2
* | | | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mas...Linus Torvalds2014-12-1232-641/+2740
|\ \ \ \ \
| * \ \ \ \ Merge branch 'raid56-scrub-replace' of git://github.com/miaoxie/linux-btrfs i...Chris Mason2014-12-02212-910/+2916
| |\ \ \ \ \
| | * | | | | Btrfs, replace: enable dev-replace for raid56Zhao Lei2014-12-031-5/+0
| | * | | | | Btrfs, raid56: fix use-after-free problem in the final device replace procedu...Miao Xie2014-12-036-20/+45
| | * | | | | Btrfs, replace: write raid56 parity into the replace target deviceMiao Xie2014-12-032-1/+24
| | * | | | | Btrfs, replace: write dirty pages into the replace target deviceMiao Xie2014-12-033-43/+97
| | * | | | | Btrfs, raid56: support parity scrub on raid56Miao Xie2014-12-033-20/+1115
| | * | | | | Btrfs, raid56: use a variant to record the operation typeMiao Xie2014-12-031-14/+17
| | * | | | | Btrfs, scrub: repair the common data on RAID5/6 if it is corruptedMiao Xie2014-12-035-33/+235
| | * | | | | Btrfs, raid56: don't change bbio and raid_mapMiao Xie2014-12-031-19/+23