diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-20 15:07:40 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-20 15:07:40 -0800 |
| commit | 906430a99ec8ca48f264e835a264df89fc50dfd4 (patch) | |
| tree | 58ed30debffc01a06df2a6a617daa6d33683441b /net/mac80211/tkip.h | |
| parent | ba721d318b24154eb7806a8673d3fc030fd39f7e (diff) | |
| parent | 0090d481ee4c5d9a54ae2c457ab3ef9111dd4a91 (diff) | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
[IA64] xen: fix xen_get_eflags.
[IA64] ia64/pv_ops/pv_cpu_ops: fix _IA64_REG_IP case.
[IA64] remove duplicate include iommu.h
[IA64] use mprintk instead of printk, in ia64_mca_modify_original_stack
[IA64] Rationalize kernel mode alignment checking
Diffstat (limited to 'net/mac80211/tkip.h')
0 files changed, 0 insertions, 0 deletions