summaryrefslogtreecommitdiffstats
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'slab/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/p...Linus Torvalds2011-01-151-0/+6
|\
| * Merge branch 'slub/hotplug' into slab/urgentPekka Enberg2011-01-151-0/+6
| |\
| | * memory hotplug: one more lock on memory hotplugKAMEZAWA Hiroyuki2011-01-111-0/+6
| | |
| \ \
| \ \
| \ \
*---. \ \ Merge branches 'core-fixes-for-linus', 'x86-fixes-for-linus', 'timers-fixes-f...Linus Torvalds2011-01-151-0/+10
|\ \ \ \ \ | |_|_|/ / |/| | | |
| | | * | tracing: Only process module tracepoints onceSteven Rostedt2011-01-141-0/+10
* | | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-post-merge-2.6Linus Torvalds2011-01-1410-0/+1860
|\ \ \ \ \
| * | | | | [SCSI] target: Add LIO target core v4.0.0-rc6Nicholas Bellinger2011-01-1410-0/+1860
* | | | | | Revert "drm: Update fbdev fb_fix_screeninfo"Dave Airlie2011-01-141-0/+3
* | | | | | PCI / ACPI: Fix build issue in pci_root.c for !CONFIG_PCIEPORTBUSMarkus Trippelsdorf2011-01-141-0/+5
* | | | | | Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-blockLinus Torvalds2011-01-141-1/+7
|\ \ \ \ \ \
| * | | | | | block: restore multiple bd_link_disk_holder() supportTejun Heo2011-01-141-1/+7
| |/ / / / /
* | | | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2011-01-1410-22/+68
|\ \ \ \ \ \
| * | | | | | etherdevice.h: Add is_unicast_ether_addr functionTobias Klauser2011-01-131-0/+11
| * | | | | | ipsec: update MAX_AH_AUTH_LEN to support sha512Nicolas Dichtel2011-01-131-1/+1
| * | | | | | net: remove dev_txq_stats_fold()Eric Dumazet2011-01-131-5/+0
| * | | | | | sched: remove unused backlog in RED statsstephen hemminger2011-01-121-1/+0
| * | | | | | Merge branch 'master' of git://1984.lsi.us.es/net-2.6David S. Miller2011-01-123-10/+25
| |\ \ \ \ \ \
| | * | | | | | netfilter: fix compilation when conntrack is disabled but tproxy is enabledKOVACS Krisztian2011-01-123-10/+25
| * | | | | | | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...David S. Miller2011-01-123-5/+31
| |\ \ \ \ \ \ \
| | * | | | | | | nl80211: add/fix mesh docsJohannes Berg2011-01-101-5/+15
| | * | | | | | | cfg80211: add mesh join/leave callback docsJohannes Berg2011-01-101-0/+2
| | * | | | | | | mac80211: add missing docs for off-chan TX flagJohannes Berg2011-01-101-0/+4
| | * | | | | | | mac80211: add remain-on-channel docsJohannes Berg2011-01-101-0/+10
* | | | | | | | | Merge branch 'for-2.6.38' of git://linux-nfs.org/~bfields/linuxLinus Torvalds2011-01-1410-129/+13
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | nfsd: don't support msnfs export optionJ. Bruce Fields2011-01-131-1/+1
| * | | | | | | | | rpc: allow xprt_class->setup to return a preexisting xprtJ. Bruce Fields2011-01-111-0/+1
| * | | | | | | | | rpc: move sk_bc_xprt to svc_xprtJ. Bruce Fields2011-01-112-1/+1
| * | | | | | | | | nfsd4: support BIND_CONN_TO_SESSIONJ. Bruce Fields2011-01-111-0/+3
| * | | | | | | | | Merge commit 'v2.6.37' into for-2.6.38-incomingJ. Bruce Fields2011-01-1127-57/+155
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ | | |/| | | | | | |
| * | | | | | | | | nfsd4: move idmap and acl header files into fs/nfsdJ. Bruce Fields2011-01-042-125/+0
| * | | | | | | | | locks: eliminate fl_mylease callbackJ. Bruce Fields2011-01-041-1/+0
| * | | | | | | | | svcrpc: simpler request droppingJ. Bruce Fields2011-01-041-0/+1
| * | | | | | | | | SUNRPC: Remove more code when NFSD_DEPRECATED is not configuredJ. Bruce Fields2011-01-041-0/+3
| * | | | | | | | | nfsd4: implement secinfo_no_nameJ. Bruce Fields2010-12-171-0/+3
| * | | | | | | | | sunrpc: remove xpt_poolNeilBrown2010-12-171-1/+0
* | | | | | | | | | Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jb...Linus Torvalds2011-01-146-8/+42
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | PCI/PM: Use pm_wakeup_event() directly for reporting wakeup eventsRafael J. Wysocki2011-01-141-1/+0
| * | | | | | | | | | PCI/ACPI: Request _OSC control once for each root bridge (v3)Rafael J. Wysocki2011-01-143-0/+23
| * | | | | | | | | | PCI/PCIe: Clear Root PME Status bits early during system resumeRafael J. Wysocki2010-12-231-0/+2
| * | | | | | | | | | x86/PCI: irq and pci_ids patch for Intel PatsburgSeth Heasley2010-12-231-1/+2
| * | | | | | | | | | PCI: make pci_restore_state return voidJon Mason2010-12-231-5/+3
| * | | | | | | | | | PCI: Disable ASPM if BIOS asks us toMatthew Garrett2010-12-231-1/+4
| * | | | | | | | | | PCI: Add mask bit definition for MSI-X tableSheng Yang2010-12-231-0/+1
| * | | | | | | | | | PCI: MSI: Move MSI-X entry definition to pci_regs.hSheng Yang2010-12-231-0/+7
* | | | | | | | | | | Merge git://git.infradead.org/battery-2.6Linus Torvalds2011-01-143-0/+72
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | power_supply: Add MAX17042 Fuel Gauge DriverMyungJoo Ham2011-01-141-0/+30
| * | | | | | | | | | | s3c_adc_battery: Add gpio_inverted field to pdataVasily Khoruzhick2010-12-221-0/+1
| * | | | | | | | | | | power_supply: Add gpio charger driverLars-Peter Clausen2010-11-181-0/+41
* | | | | | | | | | | | Merge branch 'vfs-scale-working' of git://git.kernel.org/pub/scm/linux/kernel...Linus Torvalds2011-01-141-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | kernel: fix hlist_bl againRussell King2011-01-141-1/+1