summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into for-nextJiri Kosina2010-06-163859-105445/+292997
|\
| * Linux 2.6.35-rc3v2.6.35-rc3Linus Torvalds2010-06-121-1/+1
| * Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2010-06-1114-28/+103
| |\
| | * Merge branch 'wimax-2.6.35.y' of git://git.kernel.org/pub/scm/linux/kernel/gi...David S. Miller2010-06-111-1/+1
| | |\
| | | * wimax/i2400m: fix missing endian correction read in fw loaderInaky Perez-Gonzalez2010-06-111-1/+1
| | * | net8139: fix a race at the end of NAPIFigo.zhang2010-06-112-2/+2
| | * | pktgen: Fix accuracy of inter-packet delay.Daniel Turull2010-06-111-1/+1
| | * | pkt_sched: gen_estimator: add a new lockEric Dumazet2010-06-111-3/+12
| | * | net: deliver skbs on inactive slaves to exact matchesJohn Fastabend2010-06-113-6/+20
| | * | ipv6: fix ICMP6_MIB_OUTERRORSEric Dumazet2010-06-101-2/+2
| | * | r8169: fix mdio_read and update mdio_write according to hw specsTimo Teräs2010-06-101-3/+9
| | * | Merge branch 'num_rx_queues' of git://kernel.ubuntu.com/rtg/net-2.6David S. Miller2010-06-101-5/+3
| | |\ \
| | | * | net: Print num_rx_queues imbalance warning only when there are allocated queuesTim Gardner2010-06-091-5/+3
| | * | | gianfar: Revive the driver for eTSEC devices (disable timestamping)Anton Vorontsov2010-06-101-2/+1
| | * | | caif: fix a couple range checksDan Carpenter2010-06-102-2/+2
| | * | | phylib: Add support for the LXT973 phy.Richard Cochran2010-06-101-1/+50
| | |/ /
| * | | Merge branch 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafa...Linus Torvalds2010-06-113-0/+8
| |\ \ \
| | * | | PM / x86: Save/restore MISC_ENABLE registerOndrej Zary2010-06-083-0/+8
| * | | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mas...Linus Torvalds2010-06-119-17/+41
| |\ \ \ \
| | * | | | Btrfs: The file argument for fsync() is never nullDan Carpenter2010-06-111-1/+1
| | * | | | Btrfs: handle ERR_PTR from posix_acl_from_xattr()Dan Carpenter2010-06-111-0/+2
| | * | | | Btrfs: avoid BUG when dropping root and reference in same transactionSage Weil2010-06-111-3/+0
| | * | | | Btrfs: prohibit a operation of changing acl's mask when noacl mount option usedShi Weihua2010-06-111-0/+3
| | * | | | Btrfs: should add a permission check for setfaclShi Weihua2010-06-111-0/+3
| | * | | | Btrfs: btrfs_lookup_dir_item() can return ERR_PTRDan Carpenter2010-06-111-1/+1
| | * | | | Btrfs: btrfs_read_fs_root_no_name() returns ERR_PTRsDan Carpenter2010-06-111-0/+4
| | * | | | Btrfs: unwind after btrfs_start_transaction() errorsDan Carpenter2010-06-111-1/+1
| | * | | | Btrfs: btrfs_iget() returns ERR_PTRDan Carpenter2010-06-111-2/+2
| | * | | | Btrfs: handle kzalloc() failure in open_ctree()Dan Carpenter2010-06-111-2/+5
| | * | | | Btrfs: handle error returns from btrfs_lookup_dir_item()Dan Carpenter2010-06-111-0/+2
| | * | | | Btrfs: Fix BUG_ON for fs converted from extNYan, Zheng2010-06-111-1/+2
| | * | | | Btrfs: Fix null dereference in relocation.cYan, Zheng2010-06-111-3/+4
| | * | | | Btrfs: fix remap_file_pages errorMiao Xie2010-06-111-1/+8
| | * | | | Btrfs: uninitialized data is check_path_shared()Dan Carpenter2010-06-111-1/+1
| | * | | | Btrfs: fix fallocate regressionJosef Bacik2010-06-111-1/+1
| | * | | | Btrfs: fix loop device on top of btrfsMiao Xie2010-06-111-0/+1
| * | | | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jba...Linus Torvalds2010-06-119-130/+17
| |\ \ \ \ \
| | * | | | | PCI: clear bridge resource range if BIOS assigned bad oneYinghai Lu2010-06-114-0/+5
| | * | | | | PCI: hotplug/cpqphp, fix NULL dereferenceJiri Slaby2010-06-111-0/+7
| | * | | | | Revert "PCI: create function symlinks in /sys/bus/pci/slots/N/"Jesse Barnes2010-06-113-125/+0
| | * | | | | PCI: change resource collision messages from KERN_ERR to KERN_INFOBjorn Helgaas2010-06-111-5/+5
| * | | | | | Merge branch 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmar...Linus Torvalds2010-06-112-2/+7
| |\ \ \ \ \ \
| | * | | | | | kbuild: Create output directory in Makefile.modbuiltinMichal Marek2010-06-101-0/+5
| | * | | | | | kbuild: Generate modules.builtin in make modulesMichal Marek2010-06-091-2/+2
| * | | | | | | Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/...Linus Torvalds2010-06-113-10/+11
| |\ \ \ \ \ \ \
| | * | | | | | | pcmcia: avoid validate_cis failure on CIS overrideDominik Brodowski2010-06-071-0/+1
| | * | | | | | | pcmcia: dev_node removal bugfixDominik Brodowski2010-06-071-0/+1
| | * | | | | | | pcmcia: yenta_socket.c Remove extra #ifdef CONFIG_YENTA_TIJustin P. Mattock2010-06-071-8/+6
| | * | | | | | | pcmcia: only keep saved I365_CSCINT flag if there is no PCI irqDominik Brodowski2010-06-071-2/+3
| * | | | | | | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sag...Linus Torvalds2010-06-116-51/+84
| |\ \ \ \ \ \ \ \