diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-11-09 17:51:15 (GMT) |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-11-09 17:51:15 (GMT) |
commit | aa907639f1d9fe0e3274b4f6c1088542f750a539 (patch) | |
tree | 9a49056ae536d51cb8146c2fdbaaf751f75f9a7f /drivers/net/82596.c | |
parent | a58695bb9d63764da9607bf1e7ff09ef03b190a8 (diff) | |
parent | 1c9d80ddc60f8ac26344ec3db9830e5f8016c16d (diff) | |
download | linux-fsl-qoriq-aa907639f1d9fe0e3274b4f6c1088542f750a539.tar.xz |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
sparc: Move of_set_property_mutex acquisition outside of devtree_lock grab.
sparc64: replace parentheses in pmul()
sparc64: Add a comment about why we only use certain memory barriers these days.
Diffstat (limited to 'drivers/net/82596.c')
0 files changed, 0 insertions, 0 deletions