aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAge
* Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6Linus Torvalds2007-05-07
|\
| * [SCSI] esp_scsi: Fix section mismatch warnings.Martin Habets2007-05-07
| * [VIDEO] sunxvr2500: Fix PCI device ID table.David S. Miller2007-05-07
* | Fix bluetooth HCI sysfs compileLinus Torvalds2007-05-07
|/
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6Linus Torvalds2007-05-07
|\
| * Pull mem-attribute into release branchTony Luck2007-04-30
| |\
| | * [IA64] update memory attribute aliasing documentation & test casesBjorn Helgaas2007-03-30
| | * [IA64] fail mmaps that span areas with incompatible attributesBjorn Helgaas2007-03-30
| | * [IA64] allow WB /sys/.../legacy_mem mmapsBjorn Helgaas2007-03-30
| | * [IA64] make ioremap avoid unsupported attributesBjorn Helgaas2007-03-30
| | * [IA64] rename ioremap variables to match i386Bjorn Helgaas2007-03-30
| * | Pull percpu-dtc into release branchTony Luck2007-04-30
| |\ \
| | * | [IA64] relax per-cpu TLB requirement to DTCChen, Kenneth W2007-02-06
| | * | [IA64] remove per-cpu ia64_phys_stacked_size_p8Chen, Kenneth W2007-02-06
| * | | Pull error-inject into release branchTony Luck2007-04-30
| |\ \ \
| | * | | [IA64] Fix example error injection programTony Luck2007-02-05
| | * | | [IA64] Itanium MC Error Injection Tool: pal_mc_error_inject() interfaceFenghua Yu2007-01-29
| | * | | [IA64] Itanium MC Error Injection Tool: Makefile changesFenghua Yu2007-01-29
| | * | | [IA64] Itanium MC Error Injection Tool: Driver sysfs interfaceFenghua Yu2007-01-29
| | * | | [IA64] Itanium MC Error Injection Tool: Doc and sample applicationFenghua Yu2007-01-29
| | * | | [IA64] Itanium MC Error Injection Tool: Kernel configurationFenghua Yu2007-01-29
* | | | | Merge branch 'server-cluster-locking-api' of git://linux-nfs.org/~bfields/linuxLinus Torvalds2007-05-07
|\ \ \ \ \
| * | | | | gfs2: nfs lock support for gfs2Marc Eshel2007-05-06
| * | | | | lockd: add code to handle deferred lock requestsMarc Eshel2007-05-06
| * | | | | lockd: always preallocate block in nlmsvc_lock()Marc Eshel2007-05-06
| * | | | | lockd: handle test_lock deferralsMarc Eshel2007-05-06
| * | | | | lockd: pass cookie in nlmsvc_testlockMarc Eshel2007-05-06
| * | | | | lockd: handle fl_grant callbacksMarc Eshel2007-05-06
| * | | | | lockd: save lock state on deferralMarc Eshel2007-05-06
| * | | | | locks: add fl_grant callback for asynchronous lock returnMarc Eshel2007-05-06
| * | | | | nfsd4: Convert NFSv4 to new lock interfaceMarc Eshel2007-05-06
| * | | | | locks: add lock cancel commandMarc Eshel2007-05-06
| * | | | | locks: allow {vfs,posix}_lock_file to return conflicting lockMarc Eshel2007-05-06
| * | | | | locks: factor out generic/filesystem switch from setlock codeMarc Eshel2007-05-06
| * | | | | locks: factor out generic/filesystem switch from test_lockJ. Bruce Fields2007-05-06
| * | | | | locks: give posix_test_lock same interface as ->lockMarc Eshel2007-05-06
| * | | | | locks: make ->lock release private data before returning in GETLK caseJ. Bruce Fields2007-05-06
| * | | | | locks: create posix-to-flock helper functionsJ. Bruce Fields2007-04-16
| * | | | | locks: trivial removal of unnecessary parenthesesJ. Bruce Fields2007-04-16
* | | | | | Fix up SLUB compileLinus Torvalds2007-05-07
* | | | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmwLinus Torvalds2007-05-07
|\ \ \ \ \ \
| * | | | | | [GFS2] Uncomment sprintf_symbol calling codeSteven Whitehouse2007-05-01
| * | | | | | [DLM] lowcomms styleDavid Teigland2007-05-01
| * | | | | | [GFS2] printk warning fixesakpm@linux-foundation.org2007-05-01
| * | | | | | [GFS2] Patch to fix mmap of stuffed filesSteven Whitehouse2007-05-01
| * | | | | | [GFS2] use lib/parser for parsing mount optionsJosef Bacik2007-05-01
| * | | | | | [DLM] Lowcomms nodeid range & initialisation fixesPatrick Caulfield2007-05-01
| * | | | | | [DLM] Fix dlm_lowcoms_stop hangJosef Bacik2007-05-01
| * | | | | | [DLM] fix mode mungingDavid Teigland2007-05-01
| * | | | | | [GFS2] lockdump improvementsRobert Peterson2007-05-01