diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-22 21:54:54 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-22 21:54:54 +0200 |
| commit | cfc94b2c9ac603b20db54225408df6ed80188dcd (patch) | |
| tree | 6e5b21adac556242b89931c4d0929b66efb8c0b9 /mm/ksm.c | |
| parent | dri-devel mailing list moved - update MAINTAINERS (diff) | |
| parent | firewire: ohci: wait for local CSR lock access to finish (diff) | |
| download | linux-cfc94b2c9ac603b20db54225408df6ed80188dcd.tar.xz linux-cfc94b2c9ac603b20db54225408df6ed80188dcd.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6:
firewire: ohci: wait for local CSR lock access to finish
firewire: ohci: prevent aliasing of locally handled register addresses
firewire: core: fw_iso_resource_manage: return -EBUSY when out of resources
firewire: core: fix retries calculation in iso manage_channel()
firewire: cdev: fix cut+paste mistake in disclaimer
Diffstat (limited to 'mm/ksm.c')
0 files changed, 0 insertions, 0 deletions