Merge branch 'lua'
commit754e947d3fce9d85776bfe5aaeac903b63169a87
authorH. Peter Anvin <hpa@linux.intel.com>
Fri, 2 Jul 2010 01:08:24 +0000 (1 18:08 -0700)
committerH. Peter Anvin <hpa@linux.intel.com>
Fri, 2 Jul 2010 01:08:24 +0000 (1 18:08 -0700)
tree6842f67e3b71b0724f2f7be9bcdd0adde6abf605
parent2a193d1d994023b590cc30ca500af104d46440f0
parenta42854dd830a347633d3e850bca603a074207031
Merge branch 'lua'

Resolved Conflicts:
NEWS

Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
NEWS